From 3e3b8a96185a60e4bc951438a40a3de018754f94 Mon Sep 17 00:00:00 2001 From: Maurice Lam Date: Wed, 21 Mar 2018 18:21:04 -0700 Subject: [PATCH] Make GLIF theme default for confirm lock screen Use GLIF theme as the default for confirm lock screen, even for "external" launches of the screen. Renamed the theme from "internal" to "normal" to reflect this change. Dark theme code will be cleaned up later. Test: Existing tests pass Bug: 62573742 Change-Id: I86958eb3a440d7274807f1cf453c3e53c16c23e7 --- color-check-baseline.xml | 2 +- ...ttern_internal.xml => confirm_lock_pattern_normal.xml} | 0 ...word_internal.xml => confirm_lock_password_normal.xml} | 0 ...rnal_base.xml => confirm_lock_pattern_normal_base.xml} | 0 res/values-sw600dp/aliases.xml | 2 +- res/values/aliases.xml | 2 +- .../settings/password/ChooseLockSettingsHelper.java | 3 +-- .../password/ConfirmDeviceCredentialBaseActivity.java | 8 ++++---- .../android/settings/password/ConfirmLockPassword.java | 4 ++-- src/com/android/settings/password/ConfirmLockPattern.java | 4 ++-- .../settings/password/ChooseLockSettingsHelperTest.java | 4 ++-- 11 files changed, 14 insertions(+), 15 deletions(-) rename res/layout-land/{confirm_lock_pattern_internal.xml => confirm_lock_pattern_normal.xml} (100%) rename res/layout/{confirm_lock_password_internal.xml => confirm_lock_password_normal.xml} (100%) rename res/layout/{confirm_lock_pattern_internal_base.xml => confirm_lock_pattern_normal_base.xml} (100%) diff --git a/color-check-baseline.xml b/color-check-baseline.xml index 1cf6b20077c..3b2cb815e20 100644 --- a/color-check-baseline.xml +++ b/color-check-baseline.xml @@ -1276,7 +1276,7 @@ errorLine1=" android:background="@color/lock_pattern_background" />" errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"> diff --git a/res/layout-land/confirm_lock_pattern_internal.xml b/res/layout-land/confirm_lock_pattern_normal.xml similarity index 100% rename from res/layout-land/confirm_lock_pattern_internal.xml rename to res/layout-land/confirm_lock_pattern_normal.xml diff --git a/res/layout/confirm_lock_password_internal.xml b/res/layout/confirm_lock_password_normal.xml similarity index 100% rename from res/layout/confirm_lock_password_internal.xml rename to res/layout/confirm_lock_password_normal.xml diff --git a/res/layout/confirm_lock_pattern_internal_base.xml b/res/layout/confirm_lock_pattern_normal_base.xml similarity index 100% rename from res/layout/confirm_lock_pattern_internal_base.xml rename to res/layout/confirm_lock_pattern_normal_base.xml diff --git a/res/values-sw600dp/aliases.xml b/res/values-sw600dp/aliases.xml index 86f2da5ec82..e281d37eb36 100644 --- a/res/values-sw600dp/aliases.xml +++ b/res/values-sw600dp/aliases.xml @@ -20,6 +20,6 @@ @layout/fingerprint_enroll_enrolling_base @layout/fingerprint_enroll_finish_base @layout/choose_lock_pattern_common - @layout/confirm_lock_pattern_internal_base + @layout/confirm_lock_pattern_normal_base diff --git a/res/values/aliases.xml b/res/values/aliases.xml index 8c4858dfb1b..060ba1d4dad 100644 --- a/res/values/aliases.xml +++ b/res/values/aliases.xml @@ -17,7 +17,7 @@ @*android:layout/preference_category_material @layout/confirm_lock_pattern_base - @layout/confirm_lock_pattern_internal_base + @layout/confirm_lock_pattern_normal_base @layout/confirm_lock_password_base @layout/fingerprint_enroll_find_sensor_base @layout/fingerprint_enroll_enrolling_base diff --git a/src/com/android/settings/password/ChooseLockSettingsHelper.java b/src/com/android/settings/password/ChooseLockSettingsHelper.java index 11d40a3419d..cfc0ce8a6b2 100644 --- a/src/com/android/settings/password/ChooseLockSettingsHelper.java +++ b/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); diff --git a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java index ab8c3dc4312..1775394a944 100644 --- a/src/com/android/settings/password/ConfirmDeviceCredentialBaseActivity.java +++ b/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, - DARK, + NORMAL, + 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); diff --git a/src/com/android/settings/password/ConfirmLockPassword.java b/src/com/android/settings/password/ConfirmLockPassword.java index dbca2fc12d0..a7059da9ead 100644 --- a/src/com/android/settings/password/ConfirmLockPassword.java +++ b/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 - ? R.layout.confirm_lock_password_internal + activity.getConfirmCredentialTheme() == ConfirmCredentialTheme.NORMAL + ? R.layout.confirm_lock_password_normal : R.layout.confirm_lock_password, container, false); diff --git a/src/com/android/settings/password/ConfirmLockPattern.java b/src/com/android/settings/password/ConfirmLockPattern.java index c87ff431e8f..84db5408f85 100644 --- a/src/com/android/settings/password/ConfirmLockPattern.java +++ b/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 - ? R.layout.confirm_lock_pattern_internal + activity.getConfirmCredentialTheme() == ConfirmCredentialTheme.NORMAL + ? R.layout.confirm_lock_pattern_normal : R.layout.confirm_lock_pattern, container, false); diff --git a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java b/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java index f1c8a54a157..bcb154c7465 100644 --- a/tests/robotests/src/com/android/settings/password/ChooseLockSettingsHelperTest.java +++ b/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));