Preference activity overhaul

5 files changed, 27 insertions, 18 deletions

diff --git a/app/src/main/res/layout/autofill_recycler_view.xml b/app/src/main/res/layout/autofill_recycler_view.xml
index 836cbcf5..27afa77d 100644
--- a/app/src/main/res/layout/autofill_recycler_view.xml
+++ b/app/src/main/res/layout/autofill_recycler_view.xml
@@ -2,16 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:orientation="vertical"
               android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:focusable="true"
-              android:focusableInTouchMode="true">
-
-    <SearchView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/app_search"
-        android:queryHint="Add an app to change its setting"
-        android:iconifiedByDefault="false"/>
+              android:layout_height="match_parent">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/autofill_recycler"
diff --git a/app/src/main/res/layout/autofill_row_layout.xml b/app/src/main/res/layout/autofill_row_layout.xml
index 354f9181..190c651f 100644
--- a/app/src/main/res/layout/autofill_row_layout.xml
+++ b/app/src/main/res/layout/autofill_row_layout.xml
@@ -31,15 +31,14 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="App"
                 android:id="@+id/app_name"/>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:text="The matched file.gpg/Don't ask"
-                android:id="@+id/secondary_text"/>
+                android:id="@+id/secondary_text"
+                android:textColor="@color/grey_600"/>
         </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/fragment_autofill.xml b/app/src/main/res/layout/fragment_autofill.xml
index 6ad44a0d..e5534f41 100644
--- a/app/src/main/res/layout/fragment_autofill.xml
+++ b/app/src/main/res/layout/fragment_autofill.xml
@@ -13,11 +13,18 @@
         android:layout_height="wrap_content"
         android:id="@+id/autofill_radiogroup"
         >
+        <RadioButton
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Use default setting"
+            android:id="@+id/use_default"
+            android:layout_gravity="center_vertical"
+            android:checked="false"/>
 
         <RadioButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Automatically match with password"
+            android:text="Automatically match"
             android:id="@+id/first"
             android:layout_gravity="center_vertical"
             android:checked="false"/>
@@ -29,7 +36,7 @@
             android:id="@+id/match"
             android:layout_gravity="center_vertical"
             android:checked="false"
-            android:layout_marginTop="8dp"/>
+            />
 
         <EditText
             android:layout_width="match_parent"
@@ -41,11 +48,11 @@
         <RadioButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Never autofill"
+            android:text="Never match"
             android:id="@+id/never"
             android:layout_gravity="center_vertical"
             android:checked="false"
-            android:layout_marginTop="8dp"/>
+            />
 
     </RadioGroup>
 
diff --git a/app/src/main/res/menu/autofill_preference.xml b/app/src/main/res/menu/autofill_preference.xml
new file mode 100644
index 00000000..77ce95f4
--- /dev/null
+++ b/app/src/main/res/menu/autofill_preference.xml
@@ -0,0 +1,12 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:pwstore="http://schemas.android.com/apk/res-auto"
+      xmlns:tools="http://schemas.android.com/tools"
+      tools:context=".pwdstore.autofill.AutofillPreferenceActivity">
+    <item
+        android:id="@+id/action_search"
+        android:icon="@drawable/ic_action_search"
+        android:title="@string/action_search"
+        pwstore:actionViewClass="android.support.v7.widget.SearchView"
+        pwstore:showAsAction="ifRoom|collapseActionView"/>
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preference.xml b/app/src/main/res/xml/preference.xml
index 44e38916..e8ba80cc 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -79,7 +79,7 @@
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="autofill_default"
-            android:summary="Default to 'Automatically match with password' for apps without custom settings."
+            android:summary="Default to 'Automatically match' for apps without custom settings. Otherwise, 'Never match.'"
             android:title="Automatically match by default"/>
     </PreferenceCategory>