added search feature for key management and select Activities

11 files changed, 96 insertions, 6 deletions

diff --git a/res/layout/filter_info.xml b/res/layout/filter_info.xml
new file mode 100644
index 000000000..8e07f2434
--- /dev/null
+++ b/res/layout/filter_info.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<LinearLayout

+    xmlns:android="http://schemas.android.com/apk/res/android"

+    android:layout_width="fill_parent"

+    android:layout_height="wrap_content"

+    android:paddingBottom="5dip"

+    android:orientation="horizontal">

+

+    <TextView

+        android:id="@+id/filterInfo"

+        android:layout_width="0dip"

+        android:layout_height="wrap_content"

+        android:layout_weight="1"

+        android:textAppearance="?android:attr/textAppearanceMedium"

+        android:ellipsize="end"/>

+

+    <Button

+        android:id="@+id/btn_clear"

+        android:text="@string/btn_clearFilter"

+        android:layout_width="wrap_content"

+        android:layout_height="wrap_content"/>

+

+</LinearLayout>

diff --git a/res/layout/key_list.xml b/res/layout/key_list.xml
index f08495368..ac07801ab 100644
--- a/res/layout/key_list.xml
+++ b/res/layout/key_list.xml
@@ -14,15 +14,18 @@
      limitations under the License.
 -->
 
-<ScrollView
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:fillViewport="true">
+    android:orientation="vertical">
+
+    <include android:id="@+id/layout_filter" layout="@layout/filter_info"/>
 
     <ExpandableListView
         android:id="@+id/list"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"/>
+        android:layout_height="fill_parent"
+        android:isScrollContainer="true"/>
 
-</ScrollView>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/select_public_key.xml b/res/layout/select_public_key.xml
index 3c7c6534a..9ce35a7a8 100644
--- a/res/layout/select_public_key.xml
+++ b/res/layout/select_public_key.xml
@@ -21,6 +21,8 @@
     android:layout_height="fill_parent"
     android:fillViewport="true">
 
+    <include android:id="@+id/layout_filter" layout="@layout/filter_info"/>
+
     <ListView
         android:id="@+id/list"
         android:choiceMode="multipleChoice"
diff --git a/res/layout/select_secret_key.xml b/res/layout/select_secret_key.xml
index f252f56e5..feabc6160 100644
--- a/res/layout/select_secret_key.xml
+++ b/res/layout/select_secret_key.xml
@@ -21,6 +21,8 @@
     android:layout_height="fill_parent"
     android:fillViewport="true">
 
+    <include android:id="@+id/layout_filter" layout="@layout/filter_info"/>
+
     <ListView
         android:id="@+id/list"
         android:layout_width="fill_parent"
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 008981b0e..200388c7c 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -62,6 +62,7 @@
     <string name="btn_doNotSave">Cancel</string>
     <string name="btn_delete">Delete</string>
     <string name="btn_noDate">None</string>
+    <string name="btn_clearFilter">Clear Filter</string>
 
     <!-- menu_lowerCase: capitalized words, no punctuation -->
     <string name="menu_about">About</string>
@@ -239,4 +240,14 @@
     <string name="progress_decompressingData">decompressing data...</string>
     <string name="progress_verifyingIntegrity">verifying integrity...</string>
 
+    <!-- action strings -->
+    <string name="action_encrypt">Encrypt</string>
+    <string name="action_decrypt">Decrypt</string>
+    <string name="action_importPublic">Import Public Keys</string>
+    <string name="action_importSecret">Import Secret Keys</string>
+
+    <string name="hint_publicKeys">Search Public Keys</string>
+    <string name="hint_secretKeys">Search Secret Keys</string>
+    <string name="filterInfo">Filter: \"%s\"</string>
+
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 008981b0e..200388c7c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -62,6 +62,7 @@
     <string name="btn_doNotSave">Cancel</string>
     <string name="btn_delete">Delete</string>
     <string name="btn_noDate">None</string>
+    <string name="btn_clearFilter">Clear Filter</string>
 
     <!-- menu_lowerCase: capitalized words, no punctuation -->
     <string name="menu_about">About</string>
@@ -239,4 +240,14 @@
     <string name="progress_decompressingData">decompressing data...</string>
     <string name="progress_verifyingIntegrity">verifying integrity...</string>
 
+    <!-- action strings -->
+    <string name="action_encrypt">Encrypt</string>
+    <string name="action_decrypt">Decrypt</string>
+    <string name="action_importPublic">Import Public Keys</string>
+    <string name="action_importSecret">Import Secret Keys</string>
+
+    <string name="hint_publicKeys">Search Public Keys</string>
+    <string name="hint_secretKeys">Search Secret Keys</string>
+    <string name="filterInfo">Filter: \"%s\"</string>
+
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 008981b0e..200388c7c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -62,6 +62,7 @@
     <string name="btn_doNotSave">Cancel</string>
     <string name="btn_delete">Delete</string>
     <string name="btn_noDate">None</string>
+    <string name="btn_clearFilter">Clear Filter</string>
 
     <!-- menu_lowerCase: capitalized words, no punctuation -->
     <string name="menu_about">About</string>
@@ -239,4 +240,14 @@
     <string name="progress_decompressingData">decompressing data...</string>
     <string name="progress_verifyingIntegrity">verifying integrity...</string>
 
+    <!-- action strings -->
+    <string name="action_encrypt">Encrypt</string>
+    <string name="action_decrypt">Decrypt</string>
+    <string name="action_importPublic">Import Public Keys</string>
+    <string name="action_importSecret">Import Secret Keys</string>
+
+    <string name="hint_publicKeys">Search Public Keys</string>
+    <string name="hint_secretKeys">Search Secret Keys</string>
+    <string name="filterInfo">Filter: \"%s\"</string>
+
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 8bb198ad6..d838c6073 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -62,6 +62,7 @@
     <string name="btn_doNotSave">Prekliči</string>
     <string name="btn_delete">Izbriši</string>
     <string name="btn_noDate">Brez</string>
+    <string name="btn_clearFilter">Clear Filter</string>
 
     <!-- menu_lowerCase: capitalized words, no punctuation -->
     <string name="menu_about">O programu</string>
@@ -239,4 +240,14 @@
     <string name="progress_decompressingData">raztezam podatke...</string>
     <string name="progress_verifyingIntegrity">overovljam integriteto...</string>
 
+    <!-- action strings -->
+    <string name="action_encrypt">Encrypt</string>
+    <string name="action_decrypt">Decrypt</string>
+    <string name="action_importPublic">Import Public Keys</string>
+    <string name="action_importSecret">Import Secret Keys</string>
+
+    <string name="hint_publicKeys">Search Public Keys</string>
+    <string name="hint_secretKeys">Search Secret Keys</string>
+    <string name="filterInfo">Filter: \"%s\"</string>
+
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index e4f89baf5..1eac3292f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -62,6 +62,7 @@
     <string name="btn_doNotSave">Cancel</string>
     <string name="btn_delete">Delete</string>
     <string name="btn_noDate">None</string>
+    <string name="btn_clearFilter">Clear Filter</string>
 
     <!-- menu_lowerCase: capitalized words, no punctuation -->
     <string name="menu_about">About</string>
@@ -246,9 +247,12 @@
     <!-- action strings -->
     <string name="action_encrypt">Encrypt</string>
     <string name="action_decrypt">Decrypt</string>
-    <string name="action_import_public">Import Public Keys</string>
-    <string name="action_import_secret">Import Secret Keys</string>
+    <string name="action_importPublic">Import Public Keys</string>
+    <string name="action_importSecret">Import Secret Keys</string>
 
+    <string name="hint_publicKeys">Search Public Keys</string>
+    <string name="hint_secretKeys">Search Secret Keys</string>
+    <string name="filterInfo">Filter: \"%s\"</string>
 
 </resources>
 
diff --git a/res/xml/searchable_public_keys.xml b/res/xml/searchable_public_keys.xml
new file mode 100644
index 000000000..f8963e997
--- /dev/null
+++ b/res/xml/searchable_public_keys.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<searchable
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:label="@string/app_name"
+    android:hint="@string/hint_publicKeys">
+</searchable>
diff --git a/res/xml/searchable_secret_keys.xml b/res/xml/searchable_secret_keys.xml
new file mode 100644
index 000000000..43328df82
--- /dev/null
+++ b/res/xml/searchable_secret_keys.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<searchable
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:label="@string/app_name"
+    android:hint="@string/hint_secretKeys">
+</searchable>