diff options
| author | Roman Birg <roman@cyngn.com> | 2015-12-11 11:37:00 -0600 |
|---|---|---|
| committer | Roman Birg <roman@cyngn.com> | 2015-12-11 10:35:03 -0800 |
| commit | f47c70b11106be8aa148c4788e06081df2ea0a1d (patch) | |
| tree | 7cea8478730efa00b3f5b13086382e5e0e63b5ee /src/com/android/settings | |
| parent | 0dbfd2ee3c769c4f4bbd544509aad5ef5d7ecc44 (diff) | |
| download | packages_apps_Settings-f47c70b11106be8aa148c4788e06081df2ea0a1d.zip packages_apps_Settings-f47c70b11106be8aa148c4788e06081df2ea0a1d.tar.gz packages_apps_Settings-f47c70b11106be8aa148c4788e06081df2ea0a1d.tar.bz2 | |
Settings: allow rotation while setting new pattern
Change-Id: I0fc9a7df686b8af0c60edf1916dc6fe02185f704
Signed-off-by: Roman Birg <roman@cyngn.com>
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/ChooseLockPattern.java | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java index 926884c..c85e604 100644 --- a/src/com/android/settings/ChooseLockPattern.java +++ b/src/com/android/settings/ChooseLockPattern.java @@ -202,7 +202,13 @@ public class ChooseLockPattern extends SettingsActivity { if (mUiStage == Stage.NeedToConfirm || mUiStage == Stage.ConfirmWrong) { if (mChosenPattern == null) throw new IllegalStateException( "null chosen pattern in stage 'need to confirm"); - if (mChosenPattern.equals(pattern)) { + + final String chosenPatternStr = LockPatternUtils.patternToString( + mChosenPattern, mPatternSize); + final String potentialPatternStr = LockPatternUtils.patternToString( + pattern, mPatternSize); + + if (chosenPatternStr.equals(potentialPatternStr)) { updateStage(Stage.ChoiceConfirmed); } else { updateStage(Stage.ConfirmWrong); @@ -369,7 +375,6 @@ public class ChooseLockPattern extends SettingsActivity { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - mPatternSize = getActivity().getIntent().getByteExtra("pattern_size", LockPatternUtils.PATTERN_SIZE_DEFAULT); LockPatternView.Cell.updateSize(mPatternSize); @@ -436,9 +441,9 @@ public class ChooseLockPattern extends SettingsActivity { // restore from previous state final String patternString = savedInstanceState.getString(KEY_PATTERN_CHOICE); if (patternString != null) { - LockPatternUtils utils = mChooseLockSettingsHelper.utils(); mChosenPattern = LockPatternUtils.stringToPattern(patternString, - utils.getLockPatternSize()); + mPatternSize); + mLockPatternView.setPattern(DisplayMode.Correct, mChosenPattern); } if (mCurrentPattern == null) { @@ -540,9 +545,8 @@ public class ChooseLockPattern extends SettingsActivity { outState.putInt(KEY_UI_STAGE, mUiStage.ordinal()); if (mChosenPattern != null) { - LockPatternUtils utils = mChooseLockSettingsHelper.utils(); outState.putString(KEY_PATTERN_CHOICE, - utils.patternToString(mChosenPattern)); + LockPatternUtils.patternToString(mChosenPattern, mPatternSize)); } if (mCurrentPattern != null) { |