Implement new grid layout in Gallery

Bug: 7300836
Change-Id: Iab2b4f1caa52c5aa7638983fec194b3f81cc4c31

1 files changed, 10 insertions, 0 deletions

diff --git a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
index f2b576f5f..5c246e8e3 100644
--- a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
+++ b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
@@ -16,6 +16,7 @@
 
 package com.android.gallery3d.ui;
 
+import com.android.gallery3d.R;
 import com.android.gallery3d.app.AbstractGalleryActivity;
 import com.android.gallery3d.app.AlbumSetDataLoader;
 import com.android.gallery3d.data.MediaObject;
@@ -29,6 +30,7 @@ public class AlbumSetSlotRenderer extends AbstractSlotRenderer {
     private final int mPlaceholderColor;
 
     private final ColorTexture mWaitLoadingTexture;
+    private final ResourceTexture mCameraOverlay;
     private final AbstractGalleryActivity mActivity;
     private final SelectionManager mSelectionManager;
     protected final LabelSpec mLabelSpec;
@@ -68,6 +70,8 @@ public class AlbumSetSlotRenderer extends AbstractSlotRenderer {
 
         mWaitLoadingTexture = new ColorTexture(mPlaceholderColor);
         mWaitLoadingTexture.setSize(1, 1);
+        mCameraOverlay = new ResourceTexture(activity,
+                R.drawable.frame_overlay_gallery_camera);
     }
 
     public void setPressedIndex(int index) {
@@ -122,6 +126,12 @@ public class AlbumSetSlotRenderer extends AbstractSlotRenderer {
     protected int renderOverlay(
             GLCanvas canvas, int index, AlbumSetEntry entry, int width, int height) {
         int renderRequestFlags = 0;
+        if (entry.album != null && entry.album.isCameraRoll()) {
+            int minDim = Math.min(width, height);
+            int dim = minDim / 2;
+            int pos = (minDim - dim) / 2;
+            mCameraOverlay.draw(canvas, pos, pos, dim, dim);
+        }
         if (mPressedIndex == index) {
             if (mAnimatePressedUp) {
                 drawPressedUpFrame(canvas, width, height);