OSDN Git Service
(root)
/
android-x86
/
packages-apps-Camera2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1d3a2ec
)
Don't display loading text when loading album sets.
author
Yuli Huang
<yuli@google.com>
Mon, 11 Jun 2012 06:29:23 +0000
(14:29 +0800)
committer
Yuli Huang
<yuli@google.com>
Mon, 11 Jun 2012 06:29:23 +0000
(14:29 +0800)
bug:
6635606
Change-Id: I55f0dafd5ead8455ed8bee1f03c06ca03662ebbd
src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
patch
|
blob
|
history
diff --git
a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
index
7b4a866
..
cca8d40
100644
(file)
--- 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();