From a61f6e8f93c62845f0af04ed4cda50982b4e3047 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Wed, 10 Oct 2018 15:18:12 +0200
Subject: [PATCH] add autofill hints

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 src/main/res/layout-land/account_setup.xml    | 111 +++++++++---------
 src/main/res/layout/account_setup.xml         |  29 +++--
 src/main/res/layout/edit_box_dialog.xml       |   5 +-
 src/main/res/layout/passcodelock.xml          |   6 +-
 src/main/res/layout/password_dialog.xml       |   5 +-
 .../res/layout/setup_encryption_dialog.xml    |   3 +-
 src/main/res/layout/upload_file_dialog.xml    |   1 +
 7 files changed, 88 insertions(+), 72 deletions(-)

diff --git a/src/main/res/layout-land/account_setup.xml b/src/main/res/layout-land/account_setup.xml
index 06df2f249a..5b81e33b7a 100644
--- a/src/main/res/layout-land/account_setup.xml
+++ b/src/main/res/layout-land/account_setup.xml
@@ -41,7 +41,7 @@
 			android:src="@drawable/logo"
             android:contentDescription="@string/app_name"
 			/>
-		
+
 		<ScrollView
 		    android:layout_width="0dp"
 		    android:layout_height="match_parent"
@@ -71,16 +71,17 @@
 					android:contentDescription="@string/auth_check_server"/>
 
 				<TextView
-				    android:id="@+id/instructions_message"
-				    android:layout_width="wrap_content"
-				    android:layout_height="wrap_content"
-				    android:layout_gravity="fill_horizontal"
-				    android:text="@string/auth_expired_basic_auth_toast" 
-				    android:visibility="gone"
-				    android:layout_marginBottom="@dimen/alternate_margin"
-					android:textColor="@color/login_text_color"
+                    android:id="@+id/instructions_message"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="fill_horizontal"
+                    android:text="@string/auth_expired_basic_auth_toast"
+                    android:visibility="gone"
+                    android:layout_marginBottom="@dimen/alternate_margin"
+                    android:textColor="@color/login_text_color"
                     android:contentDescription="@string/auth_expired_basic_auth_toast"/>
-			    <FrameLayout 
+
+                <FrameLayout
 	        		android:id="@+id/hostUrlFrame"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
@@ -142,7 +143,7 @@
                         android:contentDescription="@string/auth_refresh_button"
 					    />
 				</FrameLayout>
-		
+
 				<TextView
 					android:id="@+id/server_status_text"
 					android:layout_width="match_parent"
@@ -156,7 +157,7 @@
 					android:text="@string/auth_testing_connection"
 					android:minHeight="@dimen/display_text_min_height"
                     android:contentDescription="@string/auth_testing_connection"/>
-		             
+
 				<CheckBox
 					android:id="@+id/oauth_onOff_check"
 					android:layout_width="wrap_content"
@@ -175,18 +176,19 @@
                     android:layout_height="wrap_content">
 
 					<EditText
-						android:id="@+id/oAuthEntryPoint_1"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:ems="10"
-						android:enabled="false"
-						android:hint="@string/oauth_2_0_auth_end_point_address_hint"
-						android:inputType="textUri"
-						android:maxLines="1"
-						android:text="@string/oauth2_url_endpoint_auth"
-						android:textColor="@color/login_text_color"
-						android:textColorHint="@color/login_text_hint_color"
-						android:visibility="gone" />
+                        android:id="@+id/oAuthEntryPoint_1"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ems="10"
+                        android:enabled="false"
+                        android:hint="@string/oauth_2_0_auth_end_point_address_hint"
+                        android:inputType="textUri"
+                        android:maxLines="1"
+                        android:text="@string/oauth2_url_endpoint_auth"
+                        android:textColor="@color/login_text_color"
+                        android:textColorHint="@color/login_text_hint_color"
+                        android:importantForAutofill="no"
+                        android:visibility="gone" />
 
 				</android.support.design.widget.TextInputLayout>
 
@@ -196,18 +198,19 @@
                     android:layout_height="wrap_content">
 
 					<EditText
-						android:id="@+id/oAuthEntryPoint_2"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:ems="10"
-						android:enabled="false"
-						android:hint="@string/oauth_2_0_access_end_point_address_hint"
-						android:inputType="textUri"
-						android:maxLines="1"
-						android:text="@string/oauth2_url_endpoint_access"
-						android:textColor="@color/login_text_color"
-						android:textColorHint="@color/login_text_hint_color"
-						android:visibility="gone" />
+                        android:id="@+id/oAuthEntryPoint_2"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:ems="10"
+                        android:enabled="false"
+                        android:hint="@string/oauth_2_0_access_end_point_address_hint"
+                        android:inputType="textUri"
+                        android:maxLines="1"
+                        android:text="@string/oauth2_url_endpoint_access"
+                        android:textColor="@color/login_text_color"
+                        android:textColorHint="@color/login_text_hint_color"
+                        android:importantForAutofill="no"
+                        android:visibility="gone" />
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -218,14 +221,15 @@
 					android:visibility="gone">
 
 				<EditText
-					android:id="@+id/account_username"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:ems="10"
-					android:hint="@string/auth_username"
-					android:inputType="textNoSuggestions"
-					android:textColor="@color/login_text_color"
-					android:textColorHint="@color/login_text_hint_color"/>
+                    android:id="@+id/account_username"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:hint="@string/auth_username"
+                    android:inputType="textNoSuggestions"
+                    android:textColor="@color/login_text_color"
+                    android:textColorHint="@color/login_text_hint_color"
+                    android:autofillHints="username"/>
 
                 </android.support.design.widget.TextInputLayout>
 
@@ -246,11 +250,12 @@
                         android:hint="@string/auth_password"
                         android:inputType="textPassword"
                         android:textColor="@color/login_text_color"
-                        android:textColorHint="@color/login_text_hint_color"/>
+                        android:textColorHint="@color/login_text_hint_color"
+                        android:autofillHints="password"/>
 
                 </android.support.design.widget.TextInputLayout>
-		        
-				<TextView
+
+                <TextView
 					android:id="@+id/auth_status_text"
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
@@ -265,9 +270,9 @@
 
 			</LinearLayout>
 		</ScrollView>
-						           
-	</LinearLayout>
-       
+
+    </LinearLayout>
+
     <LinearLayout
         android:id="@id/bottom_block"
         android:layout_width="match_parent"
@@ -275,8 +280,8 @@
 		android:layout_alignParentBottom="true"
         android:orientation="vertical"
         android:paddingTop="@dimen/standard_half_padding">
-        
-		<android.support.v7.widget.AppCompatButton
+
+        <android.support.v7.widget.AppCompatButton
 			android:id="@+id/buttonOK"
 			android:theme="@style/Button.Login"
 			style="@style/Button.Login"
@@ -289,5 +294,5 @@
 			android:contentDescription="@string/setup_btn_connect"
 			android:visibility="gone"/>
 	</LinearLayout>
-		
+
 </RelativeLayout>
diff --git a/src/main/res/layout/account_setup.xml b/src/main/res/layout/account_setup.xml
index 51663f2e8e..dfeaadbaa6 100644
--- a/src/main/res/layout/account_setup.xml
+++ b/src/main/res/layout/account_setup.xml
@@ -19,13 +19,13 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_gravity="center"
-    android:fillViewport="true"
-    android:orientation="vertical" 
-    android:id="@+id/scroll"
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:fillViewport="true"
+            android:orientation="vertical"
+            android:id="@+id/scroll"
     >
 
     <LinearLayout
@@ -61,7 +61,7 @@
             android:text="@string/auth_check_server"
             android:visibility="gone"
             android:contentDescription="@string/auth_check_server"/>
-        
+
         <TextView
             android:id="@+id/instructions_message"
             android:layout_width="wrap_content"
@@ -73,7 +73,7 @@
             android:textColor="@color/login_text_color"
             android:contentDescription="@string/auth_expired_basic_auth_toast"/>
 
-	    <FrameLayout 
+            <FrameLayout
 	        android:id="@+id/hostUrlFrame"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
@@ -180,7 +180,8 @@
                 android:text="@string/oauth2_url_endpoint_auth"
                 android:textColor="@color/login_text_color"
                 android:textColorHint="@color/login_text_hint_color"
-                android:visibility="gone" />
+                android:visibility="gone"
+                android:importantForAutofill="no"/>
 
         </android.support.design.widget.TextInputLayout>
 
@@ -201,6 +202,7 @@
                 android:text="@string/oauth2_url_endpoint_access"
                 android:textColor="@color/login_text_color"
                 android:textColorHint="@color/login_text_hint_color"
+                android:importantForAutofill="no"
                 android:visibility="gone" />
 
         </android.support.design.widget.TextInputLayout>
@@ -220,7 +222,8 @@
                 android:hint="@string/auth_username"
                 android:inputType="textNoSuggestions"
                 android:textColor="@color/login_text_color"
-                android:textColorHint="@color/login_text_hint_color"/>
+                android:textColorHint="@color/login_text_hint_color"
+                android:autofillHints="username"/>
 
         </android.support.design.widget.TextInputLayout>
 
@@ -243,7 +246,7 @@
                 android:inputType="textPassword"
                 android:textColor="@color/login_text_color"
                 android:textColorHint="@color/login_text_hint_color"
-                />
+                android:autofillHints="password"/>
         </android.support.design.widget.TextInputLayout>
 
         <TextView
@@ -275,4 +278,4 @@
 
     </LinearLayout>
 
-</ScrollView>
\ No newline at end of file
+</ScrollView>
diff --git a/src/main/res/layout/edit_box_dialog.xml b/src/main/res/layout/edit_box_dialog.xml
index 342d8baf93..7445bcc2a8 100644
--- a/src/main/res/layout/edit_box_dialog.xml
+++ b/src/main/res/layout/edit_box_dialog.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<!--
     ownCloud Android client application
 
     Copyright (C) 2012  Bartek Przybylski
@@ -8,7 +8,7 @@
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License version 2,
     as published by the Free Software Foundation.
-  
+
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -30,6 +30,7 @@
         android:layout_height="wrap_content"
         android:ems="10"
         android:hint="@string/hint_name"
+        android:importantForAutofill="no"
         android:inputType="textNoSuggestions|textCapSentences"/>
 
 </LinearLayout>
diff --git a/src/main/res/layout/passcodelock.xml b/src/main/res/layout/passcodelock.xml
index cf348aaef9..ae48c76add 100644
--- a/src/main/res/layout/passcodelock.xml
+++ b/src/main/res/layout/passcodelock.xml
@@ -43,7 +43,7 @@
         android:gravity="center_horizontal"
         android:textSize="@dimen/two_line_secondary_text_size"
          />
-    
+
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -55,6 +55,7 @@
             style="@style/PassCodeStyle"
             android:cursorVisible="true"
             android:imeOptions="flagNoExtractUi"
+            android:importantForAutofill="no"
             android:hint="@string/hidden_character">
             <requestFocus/>
         </EditText>
@@ -64,6 +65,7 @@
             style="@style/PassCodeStyle"
             android:cursorVisible="true"
             android:imeOptions="flagNoExtractUi"
+            android:importantForAutofill="no"
             android:hint="@string/hidden_character"/>
 
         <EditText
@@ -71,6 +73,7 @@
             style="@style/PassCodeStyle"
             android:cursorVisible="true"
             android:imeOptions="flagNoExtractUi"
+            android:importantForAutofill="no"
             android:hint="@string/hidden_character"/>
 
         <EditText
@@ -78,6 +81,7 @@
             style="@style/PassCodeStyle"
             android:cursorVisible="true"
             android:imeOptions="flagNoExtractUi"
+            android:importantForAutofill="no"
             android:hint="@string/hidden_character"/>
     </LinearLayout>
 
diff --git a/src/main/res/layout/password_dialog.xml b/src/main/res/layout/password_dialog.xml
index 710dc4997d..fae9459ff3 100644
--- a/src/main/res/layout/password_dialog.xml
+++ b/src/main/res/layout/password_dialog.xml
@@ -35,9 +35,10 @@
             android:ems="10"
             android:hint="@string/hint_password"
             android:inputType="textPassword"
-            android:layout_margin="@dimen/standard_margin">
+            android:layout_margin="@dimen/standard_margin"
+            android:autofillHints="password">
         </EditText>
 
     </android.support.design.widget.TextInputLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/src/main/res/layout/setup_encryption_dialog.xml b/src/main/res/layout/setup_encryption_dialog.xml
index 8aee35c73e..82c67ab31e 100644
--- a/src/main/res/layout/setup_encryption_dialog.xml
+++ b/src/main/res/layout/setup_encryption_dialog.xml
@@ -49,5 +49,6 @@
         android:hint="@string/end_to_end_encryption_password"
         android:inputType="textPassword"
         android:textCursorDrawable="@null"
-        android:visibility="gone" />
+        android:visibility="gone"
+        android:autofillHints="password"/>
 </LinearLayout>
diff --git a/src/main/res/layout/upload_file_dialog.xml b/src/main/res/layout/upload_file_dialog.xml
index 446a49dca8..f61cd395a1 100755
--- a/src/main/res/layout/upload_file_dialog.xml
+++ b/src/main/res/layout/upload_file_dialog.xml
@@ -39,6 +39,7 @@
         android:layout_height="wrap_content"
         android:ems="10"
         android:hint="@string/hint_name"
+        android:importantForAutofill="no"
         android:inputType="textNoSuggestions|textCapSentences"/>
 
     <TextView