From 3935ca3762344c5f8a306596d70c0d4d4a2fda4b Mon Sep 17 00:00:00 2001 From: Angus Kong Date: Thu, 1 Nov 2012 15:08:44 +0800 Subject: Jump to lockscreen in secure album if tap on video bug:7454356 Change-Id: I1e7e9ed886d414d5b41abdb1cc1d00c7736ae006 --- src/com/android/gallery3d/app/PhotoPage.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/com/android') 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) { -- cgit v1.2.3