summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2012-09-05 13:00:04 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-05 13:00:05 -0700
commit482d3c0c4bc10f6ff79a0b003326ed4f31a4227d (patch)
tree2c93d12a5fa515a7d1b620ea628507ed56c6c048 /src
parent37ce22db2aa8dce5f6b05160c99b65cb3dfae0c1 (diff)
parentf9f44521327cd5206f45755a7bb06fa4065ad4c4 (diff)
downloadandroid_packages_apps_Snap-482d3c0c4bc10f6ff79a0b003326ed4f31a4227d.tar.gz
android_packages_apps_Snap-482d3c0c4bc10f6ff79a0b003326ed4f31a4227d.tar.bz2
android_packages_apps_Snap-482d3c0c4bc10f6ff79a0b003326ed4f31a4227d.zip
Merge "Increase threshold for logging texture size warnings" into gb-ub-photos-arches
Diffstat (limited to 'src')
-rw-r--r--src/com/android/gallery3d/ui/BasicTexture.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/ui/BasicTexture.java b/src/com/android/gallery3d/ui/BasicTexture.java
index 784b499ca..7b8e30de4 100644
--- a/src/com/android/gallery3d/ui/BasicTexture.java
+++ b/src/com/android/gallery3d/ui/BasicTexture.java
@@ -33,7 +33,8 @@ abstract class BasicTexture implements Texture {
protected static final int STATE_LOADED = 1;
protected static final int STATE_ERROR = -1;
- private static final int MAX_TEXTURE_SIZE = 2048;
+ // Log a warning if a texture is larger along a dimension
+ private static final int MAX_TEXTURE_SIZE = 4096;
protected int mId;
protected int mState;