summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-01-20 21:12:09 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2016-01-20 21:12:09 -0800
commitac299edc98e592ed467b4f78fb54e8568963e9d4 (patch)
treee81ff44ccdade49db9b0c97fd9a5ec3698775917 /src/com
parent313009944b6d10084ee084c157530b544b026dd7 (diff)
parent80728e69cd9c931d5f09d08d32a5fb7a5ab94b71 (diff)
downloadandroid_packages_apps_Gallery2-ac299edc98e592ed467b4f78fb54e8568963e9d4.tar.gz
android_packages_apps_Gallery2-ac299edc98e592ed467b4f78fb54e8568963e9d4.tar.bz2
android_packages_apps_Gallery2-ac299edc98e592ed467b4f78fb54e8568963e9d4.zip
Merge "Gallery2: Fix screen flicker after wake up."
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/gallery3d/ui/TiledScreenNail.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/ui/TiledScreenNail.java b/src/com/android/gallery3d/ui/TiledScreenNail.java
index 860e230bb..0ade9389c 100644
--- a/src/com/android/gallery3d/ui/TiledScreenNail.java
+++ b/src/com/android/gallery3d/ui/TiledScreenNail.java
@@ -153,7 +153,7 @@ public class TiledScreenNail implements ScreenNail {
@Override
public void draw(GLCanvas canvas, int x, int y, int width, int height) {
- if (mTexture == null || !mTexture.isReady()) {
+ if (mTexture == null) {
if (mAnimationStartTime == ANIMATION_NOT_NEEDED) {
mAnimationStartTime = ANIMATION_NEEDED;
}
@@ -177,7 +177,7 @@ public class TiledScreenNail implements ScreenNail {
@Override
public void draw(GLCanvas canvas, RectF source, RectF dest) {
- if (mTexture == null || !mTexture.isReady()) {
+ if (mTexture == null) {
canvas.fillRect(dest.left, dest.top, dest.width(), dest.height(),
mPlaceholderColor);
return;