Merge "Change display of 360 panorama button" into gb-ub-photos-arches
diff --git a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
index f2b576f..5c246e8 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 @@
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 @@
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 @@
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);