am 743f8152: Several secure album changes.

* commit '743f8152a1dd6ea47bcabc6fd95b6e8d8f1cd3e5':
  Several secure album changes.

8 files changed, 13 insertions, 4 deletions

diff --git a/res/drawable-hdpi/ic_lockscreen_handle_normal.png b/res/drawable-hdpi/ic_lockscreen_handle_normal.png
new file mode 100644
index 000000000..940405e3d
--- /dev/null
+++ b/res/drawable-hdpi/ic_lockscreen_handle_normal.png
diff --git a/res/drawable-hdpi/ic_lockscreen_unlock_normal.png b/res/drawable-hdpi/ic_lockscreen_unlock_normal.png
deleted file mode 100644
index 39608932b..000000000
--- a/res/drawable-hdpi/ic_lockscreen_unlock_normal.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_lockscreen_handle_normal.png b/res/drawable-mdpi/ic_lockscreen_handle_normal.png
new file mode 100644
index 000000000..e7c64eb7c
--- /dev/null
+++ b/res/drawable-mdpi/ic_lockscreen_handle_normal.png
diff --git a/res/drawable-mdpi/ic_lockscreen_unlock_normal.png b/res/drawable-mdpi/ic_lockscreen_unlock_normal.png
deleted file mode 100644
index 52866f258..000000000
--- a/res/drawable-mdpi/ic_lockscreen_unlock_normal.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_lockscreen_handle_normal.png b/res/drawable-xhdpi/ic_lockscreen_handle_normal.png
new file mode 100644
index 000000000..f902646ce
--- /dev/null
+++ b/res/drawable-xhdpi/ic_lockscreen_handle_normal.png
diff --git a/res/drawable-xhdpi/ic_lockscreen_unlock_normal.png b/res/drawable-xhdpi/ic_lockscreen_unlock_normal.png
deleted file mode 100644
index 0422117f7..000000000
--- a/res/drawable-xhdpi/ic_lockscreen_unlock_normal.png
+++ /dev/null
diff --git a/src/com/android/gallery3d/data/UnlockImage.java b/src/com/android/gallery3d/data/UnlockImage.java
index 68e6f0f9c..d09856d69 100644
--- a/src/com/android/gallery3d/data/UnlockImage.java
+++ b/src/com/android/gallery3d/data/UnlockImage.java
@@ -59,7 +59,7 @@ public class UnlockImage extends MediaItem {
         public Bitmap run(JobContext jc) {
             int targetSize = MediaItem.getTargetSize(mType);
             Bitmap bitmap = BitmapFactory.decodeResource(mApplication.getResources(),
-                    R.drawable.ic_lockscreen_unlock_normal);
+                    R.drawable.ic_lockscreen_handle_normal);
 
             if (mType == MediaItem.TYPE_MICROTHUMBNAIL) {
                 bitmap = BitmapUtils.resizeAndCropCenter(bitmap, targetSize, true);
diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java
index 1cd5e26c7..2fbc3ff7e 100644
--- a/src/com/android/gallery3d/ui/PhotoView.java
+++ b/src/com/android/gallery3d/ui/PhotoView.java
@@ -964,9 +964,18 @@ public class PhotoView extends GLView {
 
             if (mFilmMode && !mDownInScrolling) {
                 switchToHitPicture((int) (x + 0.5f), (int) (y + 0.5f));
-                setFilmMode(false);
-                mIgnoreUpEvent = true;
-                return true;
+
+                // If this is a lock screen photo, let the listener handle the
+                // event. Tapping on lock screen photo should take the user
+                // directly to the lock screen.
+                MediaItem item = mModel.getMediaItem(0);
+                int supported = 0;
+                if (item != null) supported = item.getSupportedOperations();
+                if ((supported & MediaItem.SUPPORT_UNLOCK) == 0) {
+                    setFilmMode(false);
+                    mIgnoreUpEvent = true;
+                    return true;
+                }
             }
 
             if (mListener != null) {