diff options
| author | Wu-cheng Li <wuchengli@google.com> | 2012-11-02 13:36:07 +0800 |
|---|---|---|
| committer | Bart Sears <bsears@google.com> | 2012-12-18 15:43:19 -0800 |
| commit | 2df5f8e5197ef6091877a2c13217ecd823738785 (patch) | |
| tree | e524b92e99ac25345a349e4ec5ad78758adff8f0 /src/com/android/gallery3d/app/PhotoPage.java | |
| parent | 97cb71043e8dc15948c7dc663504966ff988c4d1 (diff) | |
| download | android_packages_apps_Snap-2df5f8e5197ef6091877a2c13217ecd823738785.tar.gz android_packages_apps_Snap-2df5f8e5197ef6091877a2c13217ecd823738785.tar.bz2 android_packages_apps_Snap-2df5f8e5197ef6091877a2c13217ecd823738785.zip | |
Lock icon in secure album should redirect to gallery after unlock.
Use FLAG_DISMISS_KEYGUARD so lock screen will be brought up
when launching gallery.
bug:7462572
Change-Id: I345398cc6cfc09901e1ce8309ebdb65cf15088e0
The auto-merge of this CL from Arches to Bryce had a merge conflict,
so I canceled the auto-merge and then did this manual cherry-pick.
Diffstat (limited to 'src/com/android/gallery3d/app/PhotoPage.java')
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index c4d8d4090..ca3ee19ab 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -1167,7 +1167,9 @@ public abstract class PhotoPage extends ActivityState implements } else if (goBack) { onBackPressed(); } else if (unlock) { - mActivity.getStateManager().finishState(this); + Intent intent = new Intent(mActivity, Gallery.class); + intent.putExtra(Gallery.KEY_DISMISS_KEYGUARD, true); + mActivity.startActivity(intent); } else if (launchCamera) { launchCamera(); } else { |