diff options
| author | Bobby Georgescu <georgescu@google.com> | 2012-08-24 23:25:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-26 22:40:00 -0700 |
| commit | 541e25df9f933d58d4678f58519558473db5a333 (patch) | |
| tree | a7e5b7bb585a601da1106e657676588f344de58d /src | |
| parent | 02ef48574ef7099ebaa0386bd6fd676bd2fd5489 (diff) | |
| download | android_packages_apps_Gallery2-541e25df9f933d58d4678f58519558473db5a333.tar.gz android_packages_apps_Gallery2-541e25df9f933d58d4678f58519558473db5a333.tar.bz2 android_packages_apps_Gallery2-541e25df9f933d58d4678f58519558473db5a333.zip | |
Reskin: show placeholder color before album label is ready
Bug: 7050303
Change-Id: I679ecf6360f2ae3bfe19fc0677998ac8b1589bcf
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java index a1f2b4c4f..f2b576f5f 100644 --- 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; } |