diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-10-10 21:09:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-10 21:09:54 -0700 |
| commit | f2316dd7da5f5b0e4f5bc6fce899ca6fe4f63651 (patch) | |
| tree | f8afad7cbe3868b1f8b071a8cb6d4231b5b870fa | |
| parent | 1a52a6af5c42c3e3cbfdf001cb5175f4bed8c9d6 (diff) | |
| parent | c735669fdbd1aec674412f43e64b956e8c10b643 (diff) | |
| download | android_packages_apps_Gallery2-f2316dd7da5f5b0e4f5bc6fce899ca6fe4f63651.tar.gz android_packages_apps_Gallery2-f2316dd7da5f5b0e4f5bc6fce899ca6fe4f63651.tar.bz2 android_packages_apps_Gallery2-f2316dd7da5f5b0e4f5bc6fce899ca6fe4f63651.zip | |
am c735669f: Merge "Make album set grid view reflect latest UI mocks" into gb-ub-photos-arches
* commit 'c735669fdbd1aec674412f43e64b956e8c10b643':
Make album set grid view reflect latest UI mocks
| -rw-r--r-- | res/values/colors.xml | 4 | ||||
| -rw-r--r-- | res/values/dimensions.xml | 2 | ||||
| -rw-r--r-- | src/com/android/gallery3d/app/Config.java | 3 | ||||
| -rw-r--r-- | src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java | 8 |
4 files changed, 8 insertions, 9 deletions
diff --git a/res/values/colors.xml b/res/values/colors.xml index 705748c2b..9fd7802f4 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -19,9 +19,9 @@ <!-- configuration for album set page --> <color name="albumset_background">#1A1A1A</color> <color name="albumset_placeholder">#333</color> - <color name="albumset_label_background">#414143</color> + <color name="albumset_label_background">#EE414143</color> <color name="albumset_label_title">#FBFBFB</color> - <color name="albumset_label_count">#717173</color> + <color name="albumset_label_count">#A9ABAD</color> <!-- configuration for album page --> <color name="album_background">#1A1A1A</color> diff --git a/res/values/dimensions.xml b/res/values/dimensions.xml index 0bcef0b40..5d8d172ce 100644 --- a/res/values/dimensions.xml +++ b/res/values/dimensions.xml @@ -26,7 +26,7 @@ <dimen name="albumset_padding_bottom">7dp</dimen> <dimen name="albumset_slot_gap">7dp</dimen> - <dimen name="albumset_label_background_height">25dp</dimen> + <dimen name="albumset_label_background_height">30dp</dimen> <dimen name="albumset_title_offset">10dp</dimen> <dimen name="albumset_count_offset">10dp</dimen> <dimen name="albumset_title_font_size">12sp</dimen> 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) { |