diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-10-10 21:09:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-10 21:09:08 -0700 |
| commit | c735669fdbd1aec674412f43e64b956e8c10b643 (patch) | |
| tree | f45bf4aac69726a43ecd551519492a4a3ce2e865 /src | |
| parent | f8a46874235b3169a68f8bd6566c81b44de34e7a (diff) | |
| parent | 8a8b9cfdd15bf36ccd068563451d98a011a5eeab (diff) | |
| download | android_packages_apps_Gallery2-c735669fdbd1aec674412f43e64b956e8c10b643.tar.gz android_packages_apps_Gallery2-c735669fdbd1aec674412f43e64b956e8c10b643.tar.bz2 android_packages_apps_Gallery2-c735669fdbd1aec674412f43e64b956e8c10b643.zip | |
Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/app/Config.java | 3 | ||||
| -rw-r--r-- | src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/app/Config.java b/src/com/android/gallery3d/app/Config.java index 04b210e0e..7183acc33 100644 --- a/src/com/android/gallery3d/app/Config.java +++ b/src/com/android/gallery3d/app/Config.java @@ -49,8 +49,7 @@ final class Config { slotViewSpec.rowsLand = r.getInteger(R.integer.albumset_rows_land); slotViewSpec.rowsPort = r.getInteger(R.integer.albumset_rows_port); slotViewSpec.slotGap = r.getDimensionPixelSize(R.dimen.albumset_slot_gap); - slotViewSpec.slotHeightAdditional = r.getDimensionPixelSize( - R.dimen.albumset_label_background_height); + slotViewSpec.slotHeightAdditional = 0; paddingTop = r.getDimensionPixelSize(R.dimen.albumset_padding_top); paddingBottom = r.getDimensionPixelSize(R.dimen.albumset_padding_bottom); diff --git a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java index 5c246e8e3..d5337f00d 100644 --- a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java +++ b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java @@ -127,10 +127,10 @@ public class AlbumSetSlotRenderer extends AbstractSlotRenderer { 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); + int uncoveredHeight = height - mLabelSpec.labelBackgroundHeight; + int dim = uncoveredHeight / 2; + mCameraOverlay.draw(canvas, (width - dim) / 2, + (uncoveredHeight - dim) / 2, dim, dim); } if (mPressedIndex == index) { if (mAnimatePressedUp) { |