diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-06 12:47:07 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-03-06 12:47:07 +0100 |
| commit | a3fd60e7de7b277b891c7eda848dff8a49fddbc3 (patch) | |
| tree | 8f5dd58b0cd0f8f58a1008765dfb50fb9859c77d /OpenPGP-Keychain/src/main/res | |
| parent | 5f3c9f3eb9c3d2635a3f16d43742d7a12576474c (diff) | |
| parent | fab549c2b5cf637a4afc94c38f7745bfa733b316 (diff) | |
| download | open-keychain-a3fd60e7de7b277b891c7eda848dff8a49fddbc3.tar.gz open-keychain-a3fd60e7de7b277b891c7eda848dff8a49fddbc3.tar.bz2 open-keychain-a3fd60e7de7b277b891c7eda848dff8a49fddbc3.zip | |
Merge pull request #342 from mb-14/search
Implement search for KeyListPublicFragment and SelectPublicKeyFragment
Diffstat (limited to 'OpenPGP-Keychain/src/main/res')
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_search.png | bin | 0 -> 2349 bytes | |||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml | 8 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/menu/key_list_public.xml | 7 |
3 files changed, 14 insertions, 1 deletions
diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_search.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_search.png Binary files differnew file mode 100644 index 000000000..f6719d228 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_search.png diff --git a/OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml index a18ce46fc..5337433c6 100644 --- a/OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml @@ -4,8 +4,16 @@ android:layout_height="match_parent" android:layout_centerHorizontal="true" > + <EditText + android:id="@+id/select_public_key_search" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/menu_search" + android:drawableLeft="@drawable/ic_action_search"/> + <FrameLayout android:id="@+id/select_public_key_fragment_container" + android:layout_below="@id/select_public_key_search" android:layout_width="match_parent" android:layout_height="match_parent" /> diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml index cdd755dc3..35a8f3926 100644 --- a/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml +++ b/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml @@ -11,5 +11,10 @@ android:id="@+id/menu_key_list_public_export" app:showAsAction="never" android:title="@string/menu_export_keys" /> - + <item + android:id="@+id/menu_key_list_public_search" + android:title="@string/menu_search" + android:icon="@drawable/ic_action_search" + app:actionViewClass="android.support.v7.widget.SearchView" + app:showAsAction="ifRoom" /> </menu>
\ No newline at end of file |
