Use URL as package name for app/website settings and match Chrome using URL. But use site title for automatching attempts when URL match not found

2 files changed, 67 insertions, 67 deletions

diff --git a/app/src/main/res/layout/fragment_autofill.xml b/app/src/main/res/layout/fragment_autofill.xml
index 4ac1fc56..1f6aeba2 100644
--- a/app/src/main/res/layout/fragment_autofill.xml
+++ b/app/src/main/res/layout/fragment_autofill.xml
@@ -1,79 +1,79 @@
 <?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">
+<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.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">
+    <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/webName"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="@string/autofill_webname_hint"
-                android:inputType="textPersonName"/>
-        </android.support.design.widget.TextInputLayout>
-
-        <RadioGroup
-            android:id="@+id/autofill_radiogroup"
+        <EditText
+            android:id="@+id/webURL"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:hint="@string/autofill_webURL_hint"
+            android:inputType="textUri"/>
+    </android.support.design.widget.TextInputLayout>
+
+    <RadioGroup
+        android:id="@+id/autofill_radiogroup"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-            <RadioButton
-                android:id="@+id/use_default"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:checked="false"
-                android:text="@string/autofill_apps_default" />
+        <RadioButton
+            android:id="@+id/use_default"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:checked="false"
+            android:text="@string/autofill_apps_default" />
 
-            <RadioButton
-                android:id="@+id/first"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:checked="false"
-                android:text="@string/autofill_apps_first" />
+        <RadioButton
+            android:id="@+id/first"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:checked="false"
+            android:text="@string/autofill_apps_first" />
 
-            <RadioButton
-                android:id="@+id/match"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:checked="false"
-                android:text="@string/autofill_apps_match_ellipsis" />
+        <RadioButton
+            android:id="@+id/match"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:checked="false"
+            android:text="@string/autofill_apps_match_ellipsis" />
 
-            <ListView
-                android:id="@+id/matched"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_horizontal"
-                android:layout_weight="1"/>
+        <ListView
+            android:id="@+id/matched"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            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"/>
+        <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"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:checked="false"
-                android:text="@string/autofill_apps_never"/>
+        <RadioButton
+            android:id="@+id/never"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:checked="false"
+            android:text="@string/autofill_apps_never"/>
 
-        </RadioGroup>
+    </RadioGroup>
 
-    </LinearLayout>
\ No newline at end of file
+</LinearLayout>
\ 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 3f4fb345..499ae910 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -171,5 +171,5 @@
     <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_webname_hint">Name</string>
+    <string name="autofill_webURL_hint">URL</string>
 </resources>