diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-08 14:42:56 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-08 14:42:56 +0200 |
| commit | adcc07ca653db0c8a392a8dd7d75d254bd4cdbc1 (patch) | |
| tree | 4a19e1cc7560ae84a074fb716a81240bacf956c4 /OpenKeychain/src/main/res | |
| parent | 678265483a9ec7457dd75bfdaba02bf8e981b6a5 (diff) | |
| download | open-keychain-adcc07ca653db0c8a392a8dd7d75d254bd4cdbc1.tar.gz open-keychain-adcc07ca653db0c8a392a8dd7d75d254bd4cdbc1.tar.bz2 open-keychain-adcc07ca653db0c8a392a8dd7d75d254bd4cdbc1.zip | |
Filter key list by certified keys
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/key_list_content.xml | 31 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_main_fragment.xml | 1 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 |
3 files changed, 30 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/res/layout/key_list_content.xml b/OpenKeychain/src/main/res/layout/key_list_content.xml index 66b009c78..8ab63610f 100644 --- a/OpenKeychain/src/main/res/layout/key_list_content.xml +++ b/OpenKeychain/src/main/res/layout/key_list_content.xml @@ -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>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml index 6bcb216d7..691ee357d 100644 --- a/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml @@ -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" diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index afcd19f25..7fdc1b419 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -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> |