diff options
author | Maurice Lam <yukl@google.com> | 2015-01-22 18:35:11 -0800 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2015-02-12 10:52:20 -0800 |
commit | 9066a5c8b3e2e6a2c8e9d961f306e53e399fca2f (patch) | |
tree | 432c3665e6615b52e1993dada2e82f5e7a3bbdee /src/com/android/settings/SetupChooseLockGeneric.java | |
parent | 1f8b460215b5ffa7e1c7c08bf40a14f317ee6e76 (diff) | |
download | packages_apps_Settings-9066a5c8b3e2e6a2c8e9d961f306e53e399fca2f.zip packages_apps_Settings-9066a5c8b3e2e6a2c8e9d961f306e53e399fca2f.tar.gz packages_apps_Settings-9066a5c8b3e2e6a2c8e9d961f306e53e399fca2f.tar.bz2 |
Setup lock screen go back one screen at a time
SetupChooseLockGeneric no longer finishes itself when it receives a
RESULT_CANCELED result from an activity it started.
Bug: 18631770
Change-Id: I892b76847904225fe607b9406d6e76f932daa062
Diffstat (limited to 'src/com/android/settings/SetupChooseLockGeneric.java')
-rw-r--r-- | src/com/android/settings/SetupChooseLockGeneric.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/settings/SetupChooseLockGeneric.java b/src/com/android/settings/SetupChooseLockGeneric.java index e903985..94ff8d6 100644 --- a/src/com/android/settings/SetupChooseLockGeneric.java +++ b/src/com/android/settings/SetupChooseLockGeneric.java @@ -94,6 +94,15 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric SetupWizardUtils.setHeaderText(getActivity(), getActivity().getTitle()); } + @Override + public void onActivityResult(int requestCode, int resultCode, Intent data) { + if (resultCode != RESULT_CANCELED) { + super.onActivityResult(requestCode, resultCode, data); + } + // If the started activity was cancelled (e.g. the user presses back), then this + // activity will be resumed to foreground. + } + /*** * Disables preferences that are less secure than required quality and shows only secure * screen lock options here. |