diff options
| author | Bart Sears <bsears@google.com> | 2012-11-01 13:00:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-01 13:00:41 -0700 |
| commit | 22151ee069f8f4a64cd51ddbe36aac294d19e234 (patch) | |
| tree | aa0b335a1c484c02ab81cc2131dcbe217179e910 /src/com/android/gallery3d/app/PhotoPage.java | |
| parent | 74ecfe19c3b5f49b1305a496033be67bbf6d0293 (diff) | |
| parent | 40bb7158b8bda53433b36b94d6efed0e3937dcf2 (diff) | |
| download | android_packages_apps_Gallery2-22151ee069f8f4a64cd51ddbe36aac294d19e234.tar.gz android_packages_apps_Gallery2-22151ee069f8f4a64cd51ddbe36aac294d19e234.tar.bz2 android_packages_apps_Gallery2-22151ee069f8f4a64cd51ddbe36aac294d19e234.zip | |
am 40bb7158: Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
* commit '40bb7158b8bda53433b36b94d6efed0e3937dcf2':
Jump to lockscreen in secure album if tap on video
Diffstat (limited to 'src/com/android/gallery3d/app/PhotoPage.java')
| -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 1cf8cac92..097c622be 100644 --- a/src/com/android/gallery3d/app/PhotoPage.java +++ b/src/com/android/gallery3d/app/PhotoPage.java @@ -1137,8 +1137,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); @@ -1153,7 +1152,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) { |