Merge pull request #146 from zeapo/webview

Autofill: multiple associations per app & WebView/Chrome

6 files changed, 62 insertions, 17 deletions

diff --git a/app/src/main/res/layout/autofill_recycler_view.xml b/app/src/main/res/layout/autofill_recycler_view.xml
index 5dc950c2..7991341d 100644
--- a/app/src/main/res/layout/autofill_recycler_view.xml
+++ b/app/src/main/res/layout/autofill_recycler_view.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/autofill_recycler"
@@ -17,4 +18,19 @@
         android:layout_centerInParent="true"
         android:indeterminate="true"
         android:visibility="gone" />
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/fab"
+        android:src="@drawable/ic_action_new"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        app:elevation="6dp"
+        app:pressedTranslationZ="12dp"
+        app:backgroundTint="@color/blue_grey_500"
+        app:rippleColor="@color/blue_grey_50"
+        app:borderWidth="0dp"
+        android:layout_margin="@dimen/fab_compat_margin"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentRight="true"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_autofill.xml b/app/src/main/res/layout/fragment_autofill.xml
index 7bdf3d84..dd9f8419 100644
--- a/app/src/main/res/layout/fragment_autofill.xml
+++ b/app/src/main/res/layout/fragment_autofill.xml
@@ -1,12 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:paddingBottom="20dp"
-    android:paddingLeft="24dp"
-    android:paddingRight="24dp"
-    android:paddingTop="20dp">
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:paddingBottom="20dp"
+              android:paddingLeft="24dp"
+              android:paddingRight="24dp"
+              android:paddingTop="20dp">
+
+    <android.support.design.widget.TextInputLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                   android:layout_width="match_parent"
+                                                   android:layout_height="wrap_content"
+                                                   app:hintTextAppearance="@style/TextAppearance.AppCompat">
+
+        <EditText
+            android:id="@+id/webURL"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="URL"
+            android:inputType="textUri"/>
+    </android.support.design.widget.TextInputLayout>
 
     <RadioGroup
         android:id="@+id/autofill_radiogroup"
@@ -37,12 +51,20 @@
             android:checked="false"
             android:text="@string/autofill_apps_match_ellipsis" />
 
-        <EditText
+        <ListView
             android:id="@+id/matched"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:editable="false" />
+            android:layout_weight="1"/>
+
+        <Button
+            style="?android:attr/buttonStyleSmall"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="+"
+            android:id="@+id/matchButton"
+            android:layout_gravity="center_horizontal"/>
 
         <RadioButton
             android:id="@+id/never"
@@ -50,7 +72,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:checked="false"
-            android:text="@string/autofill_apps_never" />
+            android:text="@string/autofill_apps_never"/>
 
     </RadioGroup>
 
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 99af0e3f..e668f5d1 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -168,5 +168,6 @@
     <string name="autofill_apps_default">Použít výchozí nastavení</string>
     <string name="autofill_apps_first">Automaticky spárovat</string>
     <string name="autofill_apps_match_ellipsis">Spárovat s…</string>
+    <string name="autofill_apps_match">Spárovat s</string>
     <string name="autofill_apps_never">Nikdy nepárovat</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9cb6ac1b..ba134174 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -112,7 +112,7 @@
     <string name="pref_password_dialog_title">Set the time you want the password to be in clipboard</string>
     <string name="pref_copy_title">Automatically Copy Password</string>
     <string name="pref_copy_dialog_title">Automatically copy the password to the clipboard after decryption was successful.</string>
-    <string name="ssh_key_success_dialog_title" translatable="false">SSH-key imported</string>
+    <string name="ssh_key_success_dialog_title">SSH-key imported</string>
     <string name="ssh_key_error_dialog_title">Error while trying to import the ssh-key</string>
     <string name="ssh_key_error_dialog_text">Message : \n</string>
     <string name="pref_recursive_filter">Recursive filtering</string>
@@ -121,10 +121,11 @@
     <string name="pref_autofill_enable_msg">Tap OK to go to Accessibility settings. There, tap Password Store under Services then tap the switch in the top right to turn it on or off.</string>
     <string name="pref_autofill_enable_msg2">Once the service is on, a dialog will appear when you click on a password field in an app if a matching password for the app exists.</string>
     <string name="pref_autofill_enable_msg3">Password Store attempts to match apps with passwords automatically. You can change this default setting and also matching settings per-app.</string>
-    <string name="pref_autofill_apps_title">Per-app settings</string>
+    <string name="pref_autofill_apps_title">App and website settings</string>
     <string name="pref_autofill_apps_hint">Customize autofill settings for specific apps.</string>
     <string name="pref_autofill_default_title">Automatically match by default</string>
     <string name="pref_autofill_default_hint">Default to \'Automatically match\' for apps without custom settings. Otherwise, \'Never match.\'</string>
+    <string name="pref_autofill_always_title">Always show dialog</string>
     <string name="pref_clear_clipboard_title">Clear clipboard 20 times</string>
     <string name="pref_clear_clipboard_hint">Store nonsense in the clipboard 20 times instead of just once. Useful on Samsung phones that feature clipboard history.</string>
 
@@ -168,5 +169,7 @@
     <string name="autofill_apps_default">Use default setting</string>
     <string name="autofill_apps_first">Automatically match</string>
     <string name="autofill_apps_match_ellipsis">Match with…</string>
+    <string name="autofill_apps_match">Match with</string>
     <string name="autofill_apps_never">Never match</string>
+    <string name="autofill_apps_delete">Delete</string>
 </resources>
diff --git a/app/src/main/res/xml/autofill_config.xml b/app/src/main/res/xml/autofill_config.xml
index 62f82a5e..09e91174 100644
--- a/app/src/main/res/xml/autofill_config.xml
+++ b/app/src/main/res/xml/autofill_config.xml
@@ -1,9 +1,8 @@
 <accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
                        android:description="@string/autofill_description"
                        android:accessibilityEventTypes="typeViewFocused|typeViewClicked|typeWindowStateChanged|typeWindowContentChanged"
-                       android:accessibilityFlags="flagDefault|flagRetrieveInteractiveWindows"
+                       android:accessibilityFlags="flagDefault|flagRetrieveInteractiveWindows|flagReportViewIds"
                        android:accessibilityFeedbackType="feedbackGeneric"
                        android:notificationTimeout="100"
                        android:canRetrieveWindowContent="true"
-                       android:canRequestEnhancedWebAccessibility="true"
     />
\ 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 639fdfe1..f8397bc3 100644
--- a/app/src/main/res/xml/preference.xml
+++ b/app/src/main/res/xml/preference.xml
@@ -79,7 +79,6 @@
         <Preference
             android:dependency="autofill_enable"
             android:key="autofill_apps"
-            android:summary="@string/pref_autofill_apps_hint"
             android:title="@string/pref_autofill_apps_title"/>
         <CheckBoxPreference
             android:dependency="autofill_enable"
@@ -87,6 +86,11 @@
             android:key="autofill_default"
             android:summary="@string/pref_autofill_default_hint"
             android:title="@string/pref_autofill_default_title"/>
+        <CheckBoxPreference
+            android:dependency="autofill_enable"
+            android:defaultValue="false"
+            android:key="autofill_always"
+            android:title="@string/pref_autofill_always_title"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="Misc">