diff options
author | Adrian Roos <roosa@google.com> | 2015-07-17 23:29:56 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-17 23:29:58 +0000 |
commit | 57ee4b87fee76d9f85d28a09e370a92b5839a8dd (patch) | |
tree | 9960d8583cbcdd203ca62071281391eafc688b5c | |
parent | c9eb398a1b0d7954b0d4f13fb46cae3042a99a75 (diff) | |
parent | 30a7dfa329e79bab20f3b85dd376f736ebc6292d (diff) | |
download | frameworks_base-57ee4b87fee76d9f85d28a09e370a92b5839a8dd.zip frameworks_base-57ee4b87fee76d9f85d28a09e370a92b5839a8dd.tar.gz frameworks_base-57ee4b87fee76d9f85d28a09e370a92b5839a8dd.tar.bz2 |
Merge "Fix image wallpaper size" into mnc-dev
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/ImageWallpaper.java | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java index 9f6d8df..8556afc 100644 --- a/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java +++ b/packages/SystemUI/src/com/android/systemui/ImageWallpaper.java @@ -116,7 +116,6 @@ public class ImageWallpaper extends WallpaperService { private final DisplayInfo mTmpDisplayInfo = new DisplayInfo(); boolean mVisible = true; - boolean mRedrawNeeded; boolean mOffsetsChanged; int mLastXTranslation; int mLastYTranslation; @@ -153,6 +152,9 @@ public class ImageWallpaper extends WallpaperService { private int mDisplayWidthAtLastSurfaceSizeUpdate = -1; private int mDisplayHeightAtLastSurfaceSizeUpdate = -1; + private int mLastRequestedWidth = -1; + private int mLastRequestedHeight = -1; + public DrawableEngine() { super(); setFixedSizeAllowed(true); @@ -211,21 +213,13 @@ public class ImageWallpaper extends WallpaperService { int surfaceWidth = Math.max(displayInfo.logicalWidth, mBackgroundWidth); int surfaceHeight = Math.max(displayInfo.logicalHeight, mBackgroundHeight); - // If the surface dimensions haven't changed, then just return - final Rect frame = surfaceHolder.getSurfaceFrame(); - if (frame != null) { - final int dw = frame.width(); - final int dh = frame.height(); - if (surfaceWidth == dw && surfaceHeight == dh) { - return; - } - } - if (FIXED_SIZED_SURFACE) { // Used a fixed size surface, because we are special. We can do // this because we know the current design of window animations doesn't // cause this to break. surfaceHolder.setFixedSize(surfaceWidth, surfaceHeight); + mLastRequestedWidth = surfaceWidth; + mLastRequestedHeight = surfaceHeight; } else { surfaceHolder.setSizeFromLayout(); } @@ -387,7 +381,6 @@ public class ImageWallpaper extends WallpaperService { yPixels += (int) (availhUnscaled * (mYOffset - .5f) + .5f); mOffsetsChanged = false; - mRedrawNeeded = false; if (surfaceDimensionsChanged) { mLastSurfaceWidth = dw; mLastSurfaceHeight = dh; @@ -475,13 +468,15 @@ public class ImageWallpaper extends WallpaperService { out.print(" mYOffset="); out.println(mYOffset); out.print(prefix); out.print(" mVisible="); out.print(mVisible); - out.print(" mRedrawNeeded="); out.print(mRedrawNeeded); out.print(" mOffsetsChanged="); out.println(mOffsetsChanged); out.print(prefix); out.print(" mLastXTranslation="); out.print(mLastXTranslation); out.print(" mLastYTranslation="); out.print(mLastYTranslation); out.print(" mScale="); out.println(mScale); + out.print(prefix); out.print(" mLastRequestedWidth="); out.print(mLastRequestedWidth); + out.print(" mLastRequestedHeight="); out.println(mLastRequestedHeight); + out.print(prefix); out.println(" DisplayInfo at last updateSurfaceSize:"); out.print(prefix); out.print(" rotation="); out.print(mRotationAtLastSurfaceSizeUpdate); |