diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2015-07-02 00:59:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-02 00:59:48 +0000 |
| commit | 9f8e1f5d043a8c3980c1cc38779752c11620cf13 (patch) | |
| tree | c8e35c6a7dd8e5c7aca89df1fe80f2e7e42f0c74 | |
| parent | fcf9eb761463e3c6c19a56ce12ac68bf22511778 (diff) | |
| parent | aabc9869a95928660271b7022e2756fff2654013 (diff) | |
| download | frameworks_base-9f8e1f5d043a8c3980c1cc38779752c11620cf13.tar.gz frameworks_base-9f8e1f5d043a8c3980c1cc38779752c11620cf13.tar.bz2 frameworks_base-9f8e1f5d043a8c3980c1cc38779752c11620cf13.zip | |
am aabc9869: am 03850591: Handle outsets when resized is called due to rotation.
* commit 'aabc9869a95928660271b7022e2756fff2654013':
Handle outsets when resized is called due to rotation.
| -rw-r--r-- | core/java/android/service/wallpaper/WallpaperService.java | 5 | ||||
| -rw-r--r-- | services/core/java/com/android/server/wm/WindowManagerService.java | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index bbdb0e192af..d598291f783 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -271,8 +271,8 @@ public abstract class WallpaperService extends Service { public void resized(Rect frame, Rect overscanInsets, Rect contentInsets, Rect visibleInsets, Rect stableInsets, Rect outsets, boolean reportDraw, Configuration newConfig) { - Message msg = mCaller.obtainMessageI(MSG_WINDOW_RESIZED, - reportDraw ? 1 : 0); + Message msg = mCaller.obtainMessageIO(MSG_WINDOW_RESIZED, + reportDraw ? 1 : 0, outsets); mCaller.sendMessage(msg); } @@ -1192,6 +1192,7 @@ public abstract class WallpaperService extends Service { } break; case MSG_WINDOW_RESIZED: { final boolean reportDraw = message.arg1 != 0; + mEngine.mOutsets.set((Rect) message.obj); mEngine.updateSurface(true, false, reportDraw); mEngine.doOffsetsChanged(true); } break; diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 605733d72e9..fc86920b8a3 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -9629,6 +9629,7 @@ public class WindowManagerService extends IWindowManager.Stub if (w.mContentInsetsChanged || w.mVisibleInsetsChanged || winAnimator.mSurfaceResized + || w.mOutsetsChanged || configChanged) { if (DEBUG_RESIZE || DEBUG_ORIENTATION) { Slog.v(TAG, "Resize reasons for w=" + w + ": " @@ -9638,6 +9639,8 @@ public class WindowManagerService extends IWindowManager.Stub + " " + w.mVisibleInsets.toShortString() + " stableInsetsChanged=" + w.mStableInsetsChanged + " " + w.mStableInsets.toShortString() + + " outsetsChanged=" + w.mOutsetsChanged + + " " + w.mOutsets.toShortString() + " surfaceResized=" + winAnimator.mSurfaceResized + " configChanged=" + configChanged); } |