PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert fixing the style of Choose screen lock wasn’t consistent in initial setup and deferred setup" into udc-qpr-dev am: 2943132aff am: 624ebae395

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24942007

Change-Id: I0ceb3a5aec8537fa31c821bdee3a78a89d118071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Bill Lin
2023-10-20 01:51:02 +00:00
committed by Automerger Merge Worker
parent bb366b4ef3 624ebae395
commit ccdee28340
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/password/SetNewPasswordActivity.java
View File

@@ -121,7 +121,9 @@ public class SetNewPasswordActivity extends Activity implements SetNewPasswordCo
@Override @Override
public void launchChooseLock(Bundle chooseLockFingerprintExtras) { 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.setAction(mNewPasswordAction);
intent.putExtras(chooseLockFingerprintExtras); intent.putExtras(chooseLockFingerprintExtras);
if (mCallerAppName != null) { if (mCallerAppName != null) {

6
src/com/android/settings/password/SetupChooseLockGeneric.java
View File

@@ -256,12 +256,6 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
return InternalSetupChooseLockGenericFragment.class; return InternalSetupChooseLockGenericFragment.class;
} }
@Override
protected boolean isToolbarEnabled() {
// Hide the action bar from this page.
return false;
}
public static class InternalSetupChooseLockGenericFragment public static class InternalSetupChooseLockGenericFragment
extends ChooseLockGenericFragment { extends ChooseLockGenericFragment {
@Override @Override