diff options
| author | Yuli Huang <yuli@google.com> | 2012-06-11 08:48:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-11 08:48:20 -0700 |
| commit | 4712ffa668e60c23418be104a66f07da57d64cc2 (patch) | |
| tree | a9b919b6743e1e01a93b18637aefff0a3d90c424 | |
| parent | 30116cd2dd2b0da7e70537d6a52b1a620eef75d0 (diff) | |
| parent | 132db75a1fa9b41d3000c6cb29bd3d90a7d8ef28 (diff) | |
| download | android_packages_apps_Gallery2-4712ffa668e60c23418be104a66f07da57d64cc2.tar.gz android_packages_apps_Gallery2-4712ffa668e60c23418be104a66f07da57d64cc2.tar.bz2 android_packages_apps_Gallery2-4712ffa668e60c23418be104a66f07da57d64cc2.zip | |
am 132db75a: Don\'t display loading text when loading album sets.
* commit '132db75a1fa9b41d3000c6cb29bd3d90a7d8ef28':
Don't display loading text when loading album sets.
| -rw-r--r-- | src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java index 7b4a86651..cca8d40a5 100644 --- a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java +++ b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java @@ -170,12 +170,7 @@ public class AlbumSetSlotRenderer extends AbstractSlotRenderer { protected int renderLabel( GLCanvas canvas, AlbumSetEntry entry, int width, int height) { - // We show the loading message only when the album is still loading - // (Not when we are still preparing the label) Texture content = checkTexture(entry.labelTexture); - if (entry.album == null) { - content = mDataWindow.getLoadingTexture(); - } if (content != null) { int b = AlbumLabelMaker.getBorderSize(); int h = content.getHeight(); |