commit 40795bae8fff8fce4a91c449d5f6ff89e066afda
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Oct 20 00:02:03 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Oct 20 00:02:03 2023 +0000
tree 05beb8a2512aea6f78e55ed9c7a794fe4a4b5cef
parent 7db0b66d9a459b5c1347c3c232b3f3ec10a863b7
parent 5c7a73a8fb1dc5653d50233e422437184ff5eddf

Merge cherrypicks of ['googleplex-android-review.googlesource.com/24942007'] into udc-qpr1-release.

Change-Id: I0ee9abc313e868db37604a980dfa764a399ec0ca

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

diff --git a/src/com/android/settings/password/SetNewPasswordActivity.java b/src/com/android/settings/password/SetNewPasswordActivity.java
index e54ae7a..fc664ec 100644
--- a/src/com/android/settings/password/SetNewPasswordActivity.java
+++ b/src/com/android/settings/password/SetNewPasswordActivity.java
@@ -121,7 +121,9 @@
 
     @Override
     public void launchChooseLock(Bundle chooseLockFingerprintExtras) {
-        Intent intent = new Intent(this, SetupChooseLockGeneric.class);
+        final boolean isInSetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent());
+        Intent intent = isInSetupWizard ? new Intent(this, SetupChooseLockGeneric.class)
+                : new Intent(this, ChooseLockGeneric.class);
         intent.setAction(mNewPasswordAction);
         intent.putExtras(chooseLockFingerprintExtras);
         if (mCallerAppName != null) {

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

diff --git a/src/com/android/settings/password/SetupChooseLockGeneric.java b/src/com/android/settings/password/SetupChooseLockGeneric.java
index a3bef83..bc6c512 100644
--- a/src/com/android/settings/password/SetupChooseLockGeneric.java
+++ b/src/com/android/settings/password/SetupChooseLockGeneric.java
@@ -256,12 +256,6 @@
             return InternalSetupChooseLockGenericFragment.class;
         }
 
-        @Override
-        protected boolean isToolbarEnabled() {
-            // Hide the action bar from this page.
-            return false;
-        }
-
         public static class InternalSetupChooseLockGenericFragment
                 extends ChooseLockGenericFragment {
             @Override