Jump to lockscreen in secure album if tap on video

bug:7454356
Change-Id: I1e7e9ed886d414d5b41abdb1cc1d00c7736ae006

diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 4c2130b..a48db37 100644 (file)
--- 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) {