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

Merge "[Auto Pin Confirmation]: Save the autoPinConfirmOptionSetManually field state" into udc-dev am: 019ce4c02c

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

Change-Id: Ida2ec570ce03146046925733a6971e5ca6a70b23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Avinash Vadlamudi
2023-02-28 21:42:11 +00:00
committed by Automerger Merge Worker
parent 333d957462 019ce4c02c
commit 2838dde36e
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -225,6 +225,8 @@ public class ChooseLockPassword extends SettingsActivity {
private static final String KEY_UI_STAGE = "ui_stage"; private static final String KEY_UI_STAGE = "ui_stage";
private static final String KEY_CURRENT_CREDENTIAL = "current_credential"; private static final String KEY_CURRENT_CREDENTIAL = "current_credential";
private static final String FRAGMENT_TAG_SAVE_AND_FINISH = "save_and_finish_worker"; private static final String FRAGMENT_TAG_SAVE_AND_FINISH = "save_and_finish_worker";
private static final String KEY_IS_AUTO_CONFIRM_CHECK_MANUALLY_CHANGED =
"auto_confirm_option_set_manually";
private static final int MIN_AUTO_PIN_REQUIREMENT_LENGTH = 6; private static final int MIN_AUTO_PIN_REQUIREMENT_LENGTH = 6;
@@ -578,6 +580,8 @@ public class ChooseLockPassword extends SettingsActivity {
mUiStage = Stage.valueOf(state); mUiStage = Stage.valueOf(state);
updateStage(mUiStage); updateStage(mUiStage);
} }
mIsAutoPinConfirmOptionSetManually =
savedInstanceState.getBoolean(KEY_IS_AUTO_CONFIRM_CHECK_MANUALLY_CHANGED);
mCurrentCredential = savedInstanceState.getParcelable(KEY_CURRENT_CREDENTIAL); mCurrentCredential = savedInstanceState.getParcelable(KEY_CURRENT_CREDENTIAL);
@@ -660,6 +664,8 @@ public class ChooseLockPassword extends SettingsActivity {
if (mCurrentCredential != null) { if (mCurrentCredential != null) {
outState.putParcelable(KEY_CURRENT_CREDENTIAL, mCurrentCredential.duplicate()); outState.putParcelable(KEY_CURRENT_CREDENTIAL, mCurrentCredential.duplicate());
} }
outState.putBoolean(KEY_IS_AUTO_CONFIRM_CHECK_MANUALLY_CHANGED,
mIsAutoPinConfirmOptionSetManually);
} }
@Override @Override