No autofill password when in PIN settings
Change-Id: I1a629e296c4759496307510307fd907be39bb8c8
Fix: 37244398
Test: manual
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index e9b2b0f..63b7e48 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 8230ed2..2bfc470 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 22726be..6942863 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 02d28b2..0652e7e 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"