Filter key list by certified keys

This commit is contained in:
Dominik Schürmann
2014-10-08 14:42:56 +02:00
parent 678265483a
commit adcc07ca65
4 changed files with 81 additions and 4 deletions

View File

@@ -6,17 +6,42 @@
<include layout="@layout/notify_area" />
<FrameLayout
<LinearLayout
android:id="@+id/content_frame"
android:layout_marginLeft="@dimen/drawer_content_padding"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:orientation="vertical"
android:background="@color/holo_gray_bright"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<Spinner
android:id="@+id/key_list_filter_spinner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:layout_marginTop="4dp"
android:layout_marginBottom="4dp" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
</LinearLayout>
<fragment
android:id="@+id/key_list_fragment"
android:name="org.sufficientlysecure.keychain.ui.KeyListFragment"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>

View File

@@ -147,7 +147,6 @@
android:id="@+id/view_key_action_update"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:layout_marginBottom="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"

View File

@@ -489,6 +489,8 @@
<string name="key_list_empty_text3">"or"</string>
<string name="key_list_empty_button_create">"creating your own key"</string>
<string name="key_list_empty_button_import">"importing an existing key."</string>
<string name="key_list_filter_show_all">"Show all keys"</string>
<string name="key_list_filter_show_certified">"Show certified keys only"</string>
<!-- Key view -->
<string name="key_view_action_edit">"Edit key"</string>