diff options
| author | Lucky Zhang <luckyzh@google.com> | 2014-12-13 00:15:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-13 00:15:32 +0000 |
| commit | 5f17119f4683617ed5444c088b0439bb005a3514 (patch) | |
| tree | 2bc89fa2a7ca8b59549a6a3af458f590c1ba7287 /src | |
| parent | b4805e3a3481196a0e945d397bef0950a843f5a3 (diff) | |
| parent | 47811fe057052df5ea20db06696d589965092b4b (diff) | |
| download | packages_apps_Settings-5f17119f4683617ed5444c088b0439bb005a3514.zip packages_apps_Settings-5f17119f4683617ed5444c088b0439bb005a3514.tar.gz packages_apps_Settings-5f17119f4683617ed5444c088b0439bb005a3514.tar.bz2 | |
Merge "[FRP] Notification screen slides in wrong direction" into lmp-mr1-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/settings/ChooseLockPattern.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java index e454ed1..38f908e 100644 --- a/src/com/android/settings/ChooseLockPattern.java +++ b/src/com/android/settings/ChooseLockPattern.java @@ -578,12 +578,12 @@ public class ChooseLockPattern extends SettingsActivity { utils.setVisiblePatternEnabled(true); } - getActivity().setResult(RESULT_FINISHED); - getActivity().finish(); - mDone = true; if (!wasSecureBefore) { startActivity(getRedactionInterstitialIntent(getActivity())); } + getActivity().setResult(RESULT_FINISHED); + getActivity().finish(); + mDone = true; } } } |