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

Merge "Make choose lock screen consistent" into main

Browse Source
This commit is contained in:
Joshua Mccloskey
2024-08-09 17:16:04 +00:00
committed by Android (Google) Code Review
parent 3a71993386 42e46e0105
commit dbbcdd6ebe
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,9 +124,7 @@ public class SetNewPasswordActivity extends Activity implements SetNewPasswordCo
@Override @Override
public void launchChooseLock(Bundle chooseLockFingerprintExtras) { public void launchChooseLock(Bundle chooseLockFingerprintExtras) {
final boolean isInSetupWizard = WizardManagerHelper.isAnySetupWizard(getIntent()); final Intent intent = new Intent(this, SetupChooseLockGeneric.class);
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);
intent.putExtra(EXTRA_KEY_CHOOSE_LOCK_SCREEN_TITLE, intent.putExtra(EXTRA_KEY_CHOOSE_LOCK_SCREEN_TITLE,