summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuli Huang <yuli@google.com>2012-06-11 14:29:23 +0800
committerYuli Huang <yuli@google.com>2012-06-11 14:29:23 +0800
commit132db75a1fa9b41d3000c6cb29bd3d90a7d8ef28 (patch)
treea9b919b6743e1e01a93b18637aefff0a3d90c424
parent1d3a2ec89bd286f253f1f050f7e9e5406119273b (diff)
downloadandroid_packages_apps_Gallery2-132db75a1fa9b41d3000c6cb29bd3d90a7d8ef28.tar.gz
android_packages_apps_Gallery2-132db75a1fa9b41d3000c6cb29bd3d90a7d8ef28.tar.bz2
android_packages_apps_Gallery2-132db75a1fa9b41d3000c6cb29bd3d90a7d8ef28.zip
Don't display loading text when loading album sets.
bug:6635606 Change-Id: I55f0dafd5ead8455ed8bee1f03c06ca03662ebbd
-rw-r--r--src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java5
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();