ScoopDroid/android_packages_apps_Settings
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Bill Lin 2023-10-19 23:37:35 +00:00 • committed by Android (Google) Code Review
commit 2943132aff
2 changed files with 3 additions and 7 deletions
Show stats 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
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) {

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

@ -256,12 +256,6 @@ 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