From 9c2fae83a30dfb1740be8fcd2db60f22b38a4c80 Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Tue, 26 Mar 2019 18:50:21 -0700
Subject: [PATCH] Fix fingerprint icon on pattern screen

Test: atest [...]/ChooseLockPatternTest.java
Bug: 129342100
Change-Id: I4e670b6265fe4a77ecbd8ede9a703fa0762f7504
---
 res/layout-land/choose_lock_pattern.xml                       | 2 +-
 res/layout-land/confirm_lock_pattern_normal.xml               | 2 +-
 res/layout-land/fingerprint_enroll_enrolling.xml              | 2 +-
 res/layout-land/fingerprint_enroll_find_sensor.xml            | 2 +-
 res/layout-land/fingerprint_enroll_finish.xml                 | 2 +-
 res/layout/choose_lock_pattern_common.xml                     | 2 +-
 res/layout/confirm_lock_pattern_normal_base.xml               | 2 +-
 src/com/android/settings/password/ChooseLockPattern.java      | 2 +-
 .../com/android/settings/password/ChooseLockPatternTest.java  | 4 +---
 9 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index 1cc435249c4..5b06f0d8faa 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -44,7 +44,7 @@
             android:orientation="vertical">
 
             <ImageView
-                android:id="@+id/suc_layout_icon"
+                android:id="@+id/sud_layout_icon"
                 style="@style/SudGlifIcon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/res/layout-land/confirm_lock_pattern_normal.xml b/res/layout-land/confirm_lock_pattern_normal.xml
index 21c9b1ea4ca..8bb713f79d4 100644
--- a/res/layout-land/confirm_lock_pattern_normal.xml
+++ b/res/layout-land/confirm_lock_pattern_normal.xml
@@ -40,7 +40,7 @@
                 android:paddingBottom="24dp">
 
                 <ImageView
-                    android:id="@+id/suc_layout_icon"
+                    android:id="@+id/sud_layout_icon"
                     style="@style/SudGlifIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/res/layout-land/fingerprint_enroll_enrolling.xml b/res/layout-land/fingerprint_enroll_enrolling.xml
index ba2c4209253..734f8a3c06f 100644
--- a/res/layout-land/fingerprint_enroll_enrolling.xml
+++ b/res/layout-land/fingerprint_enroll_enrolling.xml
@@ -49,7 +49,7 @@
                 android:orientation="vertical">
 
                 <ImageView
-                    android:id="@+id/suc_layout_icon"
+                    android:id="@+id/sud_layout_icon"
                     style="@style/SudGlifIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/res/layout-land/fingerprint_enroll_find_sensor.xml b/res/layout-land/fingerprint_enroll_find_sensor.xml
index 28d982e9c13..6d8794ad193 100644
--- a/res/layout-land/fingerprint_enroll_find_sensor.xml
+++ b/res/layout-land/fingerprint_enroll_find_sensor.xml
@@ -55,7 +55,7 @@
                     android:clipToPadding="false">
 
                     <ImageView
-                        android:id="@+id/suc_layout_icon"
+                        android:id="@+id/sud_layout_icon"
                         style="@style/SudGlifIcon"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
diff --git a/res/layout-land/fingerprint_enroll_finish.xml b/res/layout-land/fingerprint_enroll_finish.xml
index 7d292c6516d..e80176d2c25 100644
--- a/res/layout-land/fingerprint_enroll_finish.xml
+++ b/res/layout-land/fingerprint_enroll_finish.xml
@@ -45,7 +45,7 @@
                 android:orientation="vertical">
 
                 <ImageView
-                    android:id="@+id/suc_layout_icon"
+                    android:id="@+id/sud_layout_icon"
                     style="@style/SudGlifIcon"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
diff --git a/res/layout/choose_lock_pattern_common.xml b/res/layout/choose_lock_pattern_common.xml
index 2ebcd9b1377..5d3cbca89dc 100644
--- a/res/layout/choose_lock_pattern_common.xml
+++ b/res/layout/choose_lock_pattern_common.xml
@@ -41,7 +41,7 @@
             android:orientation="vertical">
 
             <ImageView
-                android:id="@+id/suc_layout_icon"
+                android:id="@+id/sud_layout_icon"
                 style="@style/SudGlifIcon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/res/layout/confirm_lock_pattern_normal_base.xml b/res/layout/confirm_lock_pattern_normal_base.xml
index a08d5166179..03d3367e78b 100644
--- a/res/layout/confirm_lock_pattern_normal_base.xml
+++ b/res/layout/confirm_lock_pattern_normal_base.xml
@@ -33,7 +33,7 @@
             android:orientation="vertical">
 
             <ImageView
-                android:id="@+id/suc_layout_icon"
+                android:id="@+id/sud_layout_icon"
                 style="@style/SudGlifIcon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/src/com/android/settings/password/ChooseLockPattern.java b/src/com/android/settings/password/ChooseLockPattern.java
index d89ad30f98e..e0974fe3466 100644
--- a/src/com/android/settings/password/ChooseLockPattern.java
+++ b/src/com/android/settings/password/ChooseLockPattern.java
@@ -479,7 +479,7 @@ public class ChooseLockPattern extends SettingsActivity {
                     R.layout.choose_lock_pattern, container, false);
             layout.setHeaderText(getActivity().getTitle());
             if (getResources().getBoolean(R.bool.config_lock_pattern_minimal_ui)) {
-                View iconView = layout.findViewById(R.id.suc_layout_icon);
+                View iconView = layout.findViewById(R.id.sud_layout_icon);
                 if (iconView != null) {
                     iconView.setVisibility(View.GONE);
                 }
diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
index 4bc83740575..48ebbecd884 100644
--- a/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
+++ b/tests/robotests/src/com/android/settings/password/ChooseLockPatternTest.java
@@ -32,7 +32,6 @@ import com.android.settingslib.testutils.DrawableTestHelper;
 
 import com.google.android.setupdesign.GlifLayout;
 
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
@@ -93,7 +92,6 @@ public class ChooseLockPatternTest {
 
     @Config(qualifiers = "sw400dp")
     @Test
-    @Ignore("b/129342100")
     public void fingerprintExtraSet_shouldDisplayFingerprintIcon() {
         ChooseLockPattern activity = createActivity(true);
         ChooseLockPatternFragment fragment = (ChooseLockPatternFragment)
@@ -109,7 +107,7 @@ public class ChooseLockPatternTest {
         ChooseLockPatternFragment fragment = (ChooseLockPatternFragment)
                 activity.getSupportFragmentManager().findFragmentById(R.id.main_content);
 
-        View iconView = fragment.getView().findViewById(R.id.suc_layout_icon);
+        View iconView = fragment.getView().findViewById(R.id.sud_layout_icon);
         assertThat(iconView.getVisibility()).isEqualTo(View.GONE);
     }