From 8a9be07f0a153f8c83009ef037468f150108c9d5 Mon Sep 17 00:00:00 2001 From: Jason Chang Date: Tue, 22 Aug 2023 09:30:56 +0000 Subject: [PATCH 1/2] =?UTF-8?q?Fix=20the=20style=20of=20Choose=20screen=20?= =?UTF-8?q?lock=20wasn=E2=80=99t=20consistent=20in=20initial=20setup=20and?= =?UTF-8?q?=20deferred=20setup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make the style the same as DO mode SUW's Choose screen lock. Bug: 237347124 Test: manually test with reproduciable steps in PO mode: 1. Set up offline and skip initial setup. 2. Navigate to home screen. 4. Connect to WiFi. 3. Sign in corp account during deferred setup. 5. Navigate to screen lock setup. 4. When landing on Choose screen lock, observe the behavior. Change-Id: I03c7ba5e129fab121b4144fef0aa9a32dd95bcb5 --- .../android/settings/password/SetNewPasswordActivity.java | 4 +--- .../android/settings/password/SetupChooseLockGeneric.java | 6 ++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/password/SetNewPasswordActivity.java b/src/com/android/settings/password/SetNewPasswordActivity.java index fc664eccde1..e54ae7ae25b 100644 --- a/src/com/android/settings/password/SetNewPasswordActivity.java +++ b/src/com/android/settings/password/SetNewPasswordActivity.java @@ -121,9 +121,7 @@ public class SetNewPasswordActivity extends Activity implements SetNewPasswordCo @Override public void launchChooseLock(Bundle chooseLockFingerprintExtras) { - final boolean isInSetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent()); - Intent intent = isInSetupWizard ? new Intent(this, SetupChooseLockGeneric.class) - : new Intent(this, ChooseLockGeneric.class); + Intent intent = new Intent(this, SetupChooseLockGeneric.class); intent.setAction(mNewPasswordAction); intent.putExtras(chooseLockFingerprintExtras); if (mCallerAppName != null) { diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java index bc6c5129968..a3bef83d925 100644 --- a/src/com/android/settings/password/SetupChooseLockGeneric.java +++ b/src/com/android/settings/password/SetupChooseLockGeneric.java @@ -256,6 +256,12 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric { return InternalSetupChooseLockGenericFragment.class; } + @Override + protected boolean isToolbarEnabled() { + // Hide the action bar from this page. + return false; + } + public static class InternalSetupChooseLockGenericFragment extends ChooseLockGenericFragment { @Override From 584876ff09bf443faee63aa0a20864e94c02375c Mon Sep 17 00:00:00 2001 From: Holly Sun Date: Wed, 30 Aug 2023 20:22:10 +0000 Subject: [PATCH 2/2] Change feature flag to device config flag. Bug: 294858168 Test: manual Change-Id: I7411c0ef0272b1caf8a775be7216436e9e0f28a7 --- src/com/android/settings/core/FeatureFlags.java | 2 -- src/com/android/settings/core/SettingsUIDeviceConfig.java | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/core/FeatureFlags.java b/src/com/android/settings/core/FeatureFlags.java index fb552d7704d..1a97ca99116 100644 --- a/src/com/android/settings/core/FeatureFlags.java +++ b/src/com/android/settings/core/FeatureFlags.java @@ -30,6 +30,4 @@ public class FeatureFlags { public static final String CONTEXTUAL_HOME = "settings_contextual_home"; public static final String SETTINGS_SEARCH_ALWAYS_EXPAND = "settings_search_always_expand"; - public static final String PRESS_HOLD_NAV_HANDLE_TO_SEARCH = - "settings_press_hold_nav_handle_to_search"; } diff --git a/src/com/android/settings/core/SettingsUIDeviceConfig.java b/src/com/android/settings/core/SettingsUIDeviceConfig.java index 4d963856b96..2401ff50aaf 100644 --- a/src/com/android/settings/core/SettingsUIDeviceConfig.java +++ b/src/com/android/settings/core/SettingsUIDeviceConfig.java @@ -47,6 +47,11 @@ public class SettingsUIDeviceConfig { */ public static final String BT_LE_AUDIO_DEVICE_DETAIL_ENABLED = "bt_le_audio_device_detail_enabled"; + /** + * {@code true} if press and hold nav handle to search is enabled. + */ + public static final String PRESS_HOLD_NAV_HANDLE_TO_SEARCH = + "press_hold_nav_handle_to_search"; /** * {@code true} if long press home button to search is enabled. */