From 1c78242a5de99e38afcb021536d6261e34050cc5 Mon Sep 17 00:00:00 2001
From: Fan Zhang <zhfan@google.com>
Date: Fri, 21 Apr 2017 17:03:18 -0700
Subject: [PATCH] No autofill password when in PIN settings

Change-Id: I1a629e296c4759496307510307fd907be39bb8c8
Fix: 37244398
Test: manual
---
 res/layout-land/confirm_lock_password.xml     |  3 ++-
 res/layout-sw600dp/confirm_lock_password.xml  | 11 +++++++----
 res/layout/confirm_lock_password_base.xml     |  3 ++-
 res/layout/confirm_lock_password_internal.xml |  3 ++-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index e9b2b0fd056..63b7e48dfd8 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -16,7 +16,8 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:importantForAutofill="noExcludeDescendants">
 
     <include layout="@layout/confirm_lock_background_base" />
 
diff --git a/res/layout-sw600dp/confirm_lock_password.xml b/res/layout-sw600dp/confirm_lock_password.xml
index 8230ed24e6c..2bfc47084f2 100644
--- a/res/layout-sw600dp/confirm_lock_password.xml
+++ b/res/layout-sw600dp/confirm_lock_password.xml
@@ -14,12 +14,15 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:importantForAutofill="noExcludeDescendants">
 
-    <include layout="@layout/confirm_lock_password_base"
+    <include
+        layout="@layout/confirm_lock_password_base"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="center_horizontal"/>
+        android:layout_gravity="center_horizontal" />
 </FrameLayout>
diff --git a/res/layout/confirm_lock_password_base.xml b/res/layout/confirm_lock_password_base.xml
index 22726bee06d..6942863bb0a 100644
--- a/res/layout/confirm_lock_password_base.xml
+++ b/res/layout/confirm_lock_password_base.xml
@@ -16,7 +16,8 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:importantForAutofill="noExcludeDescendants">
 
     <include layout="@layout/confirm_lock_background_base" />
 
diff --git a/res/layout/confirm_lock_password_internal.xml b/res/layout/confirm_lock_password_internal.xml
index 02d28b241d8..0652e7eb11e 100644
--- a/res/layout/confirm_lock_password_internal.xml
+++ b/res/layout/confirm_lock_password_internal.xml
@@ -19,7 +19,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:icon="@drawable/ic_lock"
-    android:layout="@layout/suw_glif_blank_template">
+    android:layout="@layout/suw_glif_blank_template"
+    android:importantForAutofill="noExcludeDescendants">
 
     <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
         android:id="@+id/topLayout"