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 | d21d2aea8015ea6234819e8e5c616421858077ca (patch) | |
| tree | cda9e7fba5a47ebd473b961b7ba623f133490e2a /src | |
| parent | 4f4c036e8537ab76301f7ad0faadf42a15538d7e (diff) | |
| parent | c57b37c608f13d35fe4000870421aebb68f10b03 (diff) | |
| download | android_packages_apps_Snap-d21d2aea8015ea6234819e8e5c616421858077ca.tar.gz android_packages_apps_Snap-d21d2aea8015ea6234819e8e5c616421858077ca.tar.bz2 android_packages_apps_Snap-d21d2aea8015ea6234819e8e5c616421858077ca.zip | |
Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches
Diffstat (limited to 'src')
| -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) { |