diff options
| author | Bart Sears <bsears@google.com> | 2012-11-01 12:59:00 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-01 12:59:00 -0700 |
| commit | 40bb7158b8bda53433b36b94d6efed0e3937dcf2 (patch) | |
| tree | 75527730f1c29eb872a4b3f22d9e7b0d82fc9cc0 | |
| parent | 769d38db5736cd690ab7837c0824572739c39184 (diff) | |
| parent | 3935ca3762344c5f8a306596d70c0d4d4a2fda4b (diff) | |
| download | android_packages_apps_Gallery2-40bb7158b8bda53433b36b94d6efed0e3937dcf2.tar.gz android_packages_apps_Gallery2-40bb7158b8bda53433b36b94d6efed0e3937dcf2.tar.bz2 android_packages_apps_Gallery2-40bb7158b8bda53433b36b94d6efed0e3937dcf2.zip | |
Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
| -rw-r--r-- | src/com/android/gallery3d/app/PhotoPage.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java index 4c2130b40..a48db37d8 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -1136,8 +1136,7 @@ public class PhotoPage extends ActivityState implements } int supported = item.getSupportedOperations(); - boolean playVideo = (mSecureAlbum == null) && - ((supported & MediaItem.SUPPORT_PLAY) != 0); + boolean playVideo = ((supported & MediaItem.SUPPORT_PLAY) != 0); boolean unlock = ((supported & MediaItem.SUPPORT_UNLOCK) != 0); boolean goBack = ((supported & MediaItem.SUPPORT_BACK) != 0); boolean launchCamera = ((supported & MediaItem.SUPPORT_CAMERA_SHORTCUT) != 0); @@ -1152,7 +1151,11 @@ public class PhotoPage extends ActivityState implements } if (playVideo) { - playVideo(mActivity, item.getPlayUri(), item.getName()); + if (mSecureAlbum == null) { + playVideo(mActivity, item.getPlayUri(), item.getName()); + } else { + mActivity.getStateManager().finishState(this); + } } else if (goBack) { onBackPressed(); } else if (unlock) { |