Reskin: show placeholder color before album label is ready

Bug: 7050303
Change-Id: I679ecf6360f2ae3bfe19fc0677998ac8b1589bcf

diff --git a/res/values/colors.xml b/res/values/colors.xml
index 96db243..c4afede 100644 (file)
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -18,7 +18,7 @@
 
     <!-- configuration for album set page -->
     <color name="albumset_background">#FF000000</color>
-    <color name="albumset_placeholder">#FFDDDDDD</color>
+    <color name="albumset_placeholder">#FF444444</color>
     <color name="albumset_label_background">#FFCCCCCC</color>
     <color name="albumset_label_title">#FF000000</color>
     <color name="albumset_label_count">#80000000</color>

diff --git a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
index a1f2b4c..f2b576f 100644 (file)
--- a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
+++ b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
@@ -174,11 +174,13 @@ public class AlbumSetSlotRenderer extends AbstractSlotRenderer {
     protected int renderLabel(
             GLCanvas canvas, AlbumSetEntry entry, int width, int height) {
         Texture content = checkTexture(entry.labelTexture);
-        if (content != null) {
-            int b = AlbumLabelMaker.getBorderSize();
-            int h = content.getHeight();
-            content.draw(canvas, -b, height - h + b, width + b + b, h);
+        if (content == null) {
+            content = mWaitLoadingTexture;
         }
+        int b = AlbumLabelMaker.getBorderSize();
+        int h = mLabelSpec.labelBackgroundHeight;
+        content.draw(canvas, -b, height - h + b, width + b + b, h);
+
         return 0;
     }