From 935cea2ca7bd118888654e1f7daa91222efae05f Mon Sep 17 00:00:00 2001 From: Rubin Xu Date: Tue, 2 Jul 2024 17:01:21 +0100 Subject: [PATCH] Gray out admin-disabled screenlock option properly Fix an issue where some sceenlock options are disabled by admins but not showing up as grayed out. Bug: 288081292 Flag: EXEMPT bug fix Test: manually with `am start -a android.app.action.SET_NEW_PASSWORD --ez isSetupFlow true --ei android.app.extra.PASSWORD_COMPLEXITY 327680` Change-Id: I4aab61a052bc2c5146f44d0bfcd8153e3f2cee92 --- src/com/android/settings/password/SetupChooseLockGeneric.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java index cfd12f087c5..1b771a2f84a 100644 --- a/src/com/android/settings/password/SetupChooseLockGeneric.java +++ b/src/com/android/settings/password/SetupChooseLockGeneric.java @@ -243,6 +243,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric { @Override protected void onCreate(Bundle savedState) { setTheme(SetupWizardUtils.getTheme(this, getIntent())); + setTheme(R.style.SettingsPreferenceTheme_SetupWizard); ThemeHelper.trySetDynamicColor(this); super.onCreate(savedState); }