Merge "Jump to lockscreen in secure album if tap on video" into gb-ub-photos-arches (40bb7158) · Commits · e / os / android_packages_apps_Gallery2

src/com/android/gallery3d/app/PhotoPage.java

+6 −3

Original line number	Diff line number	Diff line
		@@ -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) {
		if (mSecureAlbum == null) {
		playVideo(mActivity, item.getPlayUri(), item.getName());
		} else {
		mActivity.getStateManager().finishState(this);
		}
		} else if (goBack) {
		onBackPressed();
		} else if (unlock) {