Merge "Make GLIF theme default for confirm lock screen" into pi-dev

am: a82183849d

Change-Id: I957b9adf288309a1c1af22d50c816d0e084c8645

color-check-baseline.xml

@@ -1276,7 +1276,7 @@
         errorLine1="                android:background="@color/lock_pattern_background" />"
         errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="res/layout-land/confirm_lock_pattern_internal.xml"
+            file="res/layout-land/confirm_lock_pattern_normal.xml"
             line="111"
             column="17"/>
     </issue>

res/values-sw600dp/aliases.xml

@@ -20,6 +20,6 @@
      <item name="fingerprint_enroll_enrolling" type="layout">@layout/fingerprint_enroll_enrolling_base</item>
      <item name="fingerprint_enroll_finish" type="layout">@layout/fingerprint_enroll_finish_base</item>
      <item name="choose_lock_pattern" type="layout">@layout/choose_lock_pattern_common</item>
-     <item name="confirm_lock_pattern_internal" type="layout">@layout/confirm_lock_pattern_internal_base</item>
+     <item name="confirm_lock_pattern_normal" type="layout">@layout/confirm_lock_pattern_normal_base</item>
 </resources>
 

res/values/aliases.xml

@@ -17,7 +17,7 @@
 <resources>
      <item name="notification_app_section" type="layout">@*android:layout/preference_category_material</item>
      <item name="confirm_lock_pattern" type="layout">@layout/confirm_lock_pattern_base</item>
-     <item name="confirm_lock_pattern_internal" type="layout">@layout/confirm_lock_pattern_internal_base</item>
+     <item name="confirm_lock_pattern_normal" type="layout">@layout/confirm_lock_pattern_normal_base</item>
      <item name="confirm_lock_password" type="layout">@layout/confirm_lock_password_base</item>
      <item name="fingerprint_enroll_find_sensor" type="layout">@layout/fingerprint_enroll_find_sensor_base</item>
      <item name="fingerprint_enroll_enrolling" type="layout">@layout/fingerprint_enroll_enrolling_base</item>

src/com/android/settings/password/ChooseLockSettingsHelper.java

@@ -279,13 +279,12 @@ public final class ChooseLockSettingsHelper {
             CharSequence message, Class<?> activityClass, boolean returnCredentials,
             boolean external, boolean hasChallenge, long challenge,
             int userId, @Nullable CharSequence alternateButton, Bundle extras) {
-        final boolean frp = (userId == LockPatternUtils.USER_FRP);
         final Intent intent = new Intent();
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.TITLE_TEXT, title);
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.HEADER_TEXT, header);
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.DETAILS_TEXT, message);
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.ALLOW_FP_AUTHENTICATION, external);
-        intent.putExtra(ConfirmDeviceCredentialBaseFragment.DARK_THEME, external && !frp);
+        intent.putExtra(ConfirmDeviceCredentialBaseFragment.DARK_THEME, false);
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, external);
         intent.putExtra(ConfirmDeviceCredentialBaseFragment.SHOW_WHEN_LOCKED, external);
         intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_RETURN_CREDENTIALS, returnCredentials);

src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java

@@ -34,8 +34,8 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
     private static final String STATE_IS_KEYGUARD_LOCKED = "STATE_IS_KEYGUARD_LOCKED";
 
     enum ConfirmCredentialTheme {
-        INTERNAL,
+        NORMAL,
-        DARK,
+        DARK,  // TODO(yukl): Clean up DARK theme, as it should no longer be used
         WORK
     }
 
@@ -63,11 +63,11 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
             mConfirmCredentialTheme = ConfirmCredentialTheme.DARK;
         } else {
             setTheme(SetupWizardUtils.getTheme(getIntent()));
-            mConfirmCredentialTheme = ConfirmCredentialTheme.INTERNAL;
+            mConfirmCredentialTheme = ConfirmCredentialTheme.NORMAL;
         }
         super.onCreate(savedState);
 
-        if (mConfirmCredentialTheme == ConfirmCredentialTheme.INTERNAL) {
+        if (mConfirmCredentialTheme == ConfirmCredentialTheme.NORMAL) {
             // Prevent the content parent from consuming the window insets because GlifLayout uses
             // it to show the status bar background.
             LinearLayout layout = (LinearLayout) findViewById(R.id.content_parent);

src/com/android/settings/password/ConfirmLockPassword.java

@@ -121,8 +121,8 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity {
 
             ConfirmLockPassword activity = (ConfirmLockPassword) getActivity();
             View view = inflater.inflate(
-                    activity.getConfirmCredentialTheme() == ConfirmCredentialTheme.INTERNAL
+                    activity.getConfirmCredentialTheme() == ConfirmCredentialTheme.NORMAL
-                            ? R.layout.confirm_lock_password_internal
+                            ? R.layout.confirm_lock_password_normal
                             : R.layout.confirm_lock_password,
                     container,
                     false);

src/com/android/settings/password/ConfirmLockPattern.java

@@ -109,8 +109,8 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
                 Bundle savedInstanceState) {
             ConfirmLockPattern activity = (ConfirmLockPattern) getActivity();
             View view = inflater.inflate(
-                    activity.getConfirmCredentialTheme() == ConfirmCredentialTheme.INTERNAL
+                    activity.getConfirmCredentialTheme() == ConfirmCredentialTheme.NORMAL
-                            ? R.layout.confirm_lock_pattern_internal
+                            ? R.layout.confirm_lock_pattern_normal
                             : R.layout.confirm_lock_pattern,
                     container,
                     false);

tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java

@@ -63,7 +63,7 @@ public class ChooseLockSettingsHelperTest {
                 (startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0);
         assertEquals(true, startedIntent.getBooleanExtra(
                 ConfirmDeviceCredentialBaseFragment.ALLOW_FP_AUTHENTICATION, false));
-        assertEquals(true, startedIntent.getBooleanExtra(
+        assertFalse(startedIntent.getBooleanExtra(
                 ConfirmDeviceCredentialBaseFragment.DARK_THEME, false));
         assertEquals(true, startedIntent.getBooleanExtra(
                 ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, false));
@@ -101,7 +101,7 @@ public class ChooseLockSettingsHelperTest {
                 (startedIntent.getFlags() & Intent.FLAG_ACTIVITY_FORWARD_RESULT) != 0);
         assertEquals(false, startedIntent.getBooleanExtra(
                 ConfirmDeviceCredentialBaseFragment.ALLOW_FP_AUTHENTICATION, false));
-        assertEquals(false, startedIntent.getBooleanExtra(
+        assertFalse(startedIntent.getBooleanExtra(
                 ConfirmDeviceCredentialBaseFragment.DARK_THEME, false));
         assertEquals(false, startedIntent.getBooleanExtra(
                 ConfirmDeviceCredentialBaseFragment.SHOW_CANCEL_BUTTON, false));