From 93d87ff509cabdad9f02f379df7eba01a44969c7 Mon Sep 17 00:00:00 2001 From: Bobby Georgescu Date: Thu, 23 Aug 2012 13:05:53 -0700 Subject: Ongoing reskin of Gallery app Bug: 7050303 Moved the majority of color settings from hardcoded to colors.xml in order to allow rapid iteration with UX input. Started changing some colors and layouts to reflect latest UX mocks. Change-Id: I300338e9f75c71f3ed3f36140d16e893387f3184 --- src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java') diff --git a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java index cee36d969..bdc0e676e 100644 --- a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java +++ b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java @@ -28,7 +28,7 @@ public class AlbumSetSlotRenderer extends AbstractSlotRenderer { @SuppressWarnings("unused") private static final String TAG = "AlbumSetView"; private static final int CACHE_SIZE = 96; - private static final int PLACEHOLDER_COLOR = 0xFFDDDDDD; + private final int mPlaceholderColor; private final ColorTexture mWaitLoadingTexture; private final GalleryActivity mActivity; @@ -52,20 +52,23 @@ public class AlbumSetSlotRenderer extends AbstractSlotRenderer { public int leftMargin; public int iconSize; public int titleRightMargin; + public int backgroundColor; + public int titleColor; + public int countColor; + public int borderSize; } public AlbumSetSlotRenderer(GalleryActivity activity, SelectionManager selectionManager, - SlotView slotView, LabelSpec labelSpec) { + SlotView slotView, LabelSpec labelSpec, int placeholderColor) { super ((Context) activity); mActivity = activity; mSelectionManager = selectionManager; mSlotView = slotView; mLabelSpec = labelSpec; + mPlaceholderColor = placeholderColor; - mWaitLoadingTexture = new ColorTexture(PLACEHOLDER_COLOR); + mWaitLoadingTexture = new ColorTexture(mPlaceholderColor); mWaitLoadingTexture.setSize(1, 1); - - Context context = activity.getAndroidContext(); } public void setPressedIndex(int index) { @@ -149,7 +152,7 @@ public class AlbumSetSlotRenderer extends AbstractSlotRenderer { entry.isWaitLoadingDisplayed = true; } else if (entry.isWaitLoadingDisplayed) { entry.isWaitLoadingDisplayed = false; - content = new FadeInTexture(PLACEHOLDER_COLOR, entry.bitmapTexture); + content = new FadeInTexture(mPlaceholderColor, entry.bitmapTexture); entry.content = content; } drawContent(canvas, content, width, height, entry.rotation); -- cgit v1.2.3