diff options
| author | Adrian Roos <roosa@google.com> | 2018-03-07 22:58:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-07 22:58:34 +0000 |
| commit | b8d853732c71bda480956f7e7001bda5c0bb14af (patch) | |
| tree | ff667179a2c58986911408bd5448c0a39267eeb0 /core/java | |
| parent | a42585c349357a6e47fea22a672dedefb802e70b (diff) | |
| parent | 9e370f2912620a4f3239cb58d2bce23a58f78cd6 (diff) | |
Merge "Window: Provide frame size hint to ViewRootImpl" into pi-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/service/wallpaper/WallpaperService.java | 4 | ||||
| -rw-r--r-- | core/java/android/view/IWindowSession.aidl | 4 | ||||
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/core/java/android/service/wallpaper/WallpaperService.java b/core/java/android/service/wallpaper/WallpaperService.java index 8588df7f136a..a1327301da67 100644 --- a/core/java/android/service/wallpaper/WallpaperService.java +++ b/core/java/android/service/wallpaper/WallpaperService.java @@ -788,8 +788,8 @@ public abstract class WallpaperService extends Service { com.android.internal.R.style.Animation_Wallpaper; mInputChannel = new InputChannel(); if (mSession.addToDisplay(mWindow, mWindow.mSeq, mLayout, View.VISIBLE, - Display.DEFAULT_DISPLAY, mContentInsets, mStableInsets, mOutsets, - mDisplayCutout, mInputChannel) < 0) { + Display.DEFAULT_DISPLAY, mWinFrame, mContentInsets, mStableInsets, + mOutsets, mDisplayCutout, mInputChannel) < 0) { Log.w(TAG, "Failed to add window while updating wallpaper surface."); return; } diff --git a/core/java/android/view/IWindowSession.aidl b/core/java/android/view/IWindowSession.aidl index d7fd3299b9e3..d8a5609a3c98 100644 --- a/core/java/android/view/IWindowSession.aidl +++ b/core/java/android/view/IWindowSession.aidl @@ -41,8 +41,8 @@ interface IWindowSession { in int viewVisibility, out Rect outContentInsets, out Rect outStableInsets, out InputChannel outInputChannel); int addToDisplay(IWindow window, int seq, in WindowManager.LayoutParams attrs, - in int viewVisibility, in int layerStackId, out Rect outContentInsets, - out Rect outStableInsets, out Rect outOutsets, + in int viewVisibility, in int layerStackId, out Rect outFrame, + out Rect outContentInsets, out Rect outStableInsets, out Rect outOutsets, out DisplayCutout.ParcelableWrapper displayCutout, out InputChannel outInputChannel); int addWithoutInputChannel(IWindow window, int seq, in WindowManager.LayoutParams attrs, in int viewVisibility, out Rect outContentInsets, out Rect outStableInsets); diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 95e4abb648b4..d908e7979cf7 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -753,7 +753,7 @@ public final class ViewRootImpl implements ViewParent, mAttachInfo.mRecomputeGlobalAttributes = true; collectViewAttributes(); res = mWindowSession.addToDisplay(mWindow, mSeq, mWindowAttributes, - getHostVisibility(), mDisplay.getDisplayId(), + getHostVisibility(), mDisplay.getDisplayId(), mWinFrame, mAttachInfo.mContentInsets, mAttachInfo.mStableInsets, mAttachInfo.mOutsets, mAttachInfo.mDisplayCutout, mInputChannel); } catch (RemoteException e) { @@ -1711,8 +1711,8 @@ public final class ViewRootImpl implements ViewParent, desiredWindowWidth = size.x; desiredWindowHeight = size.y; } else { - desiredWindowWidth = dipToPx(config.screenWidthDp); - desiredWindowHeight = dipToPx(config.screenHeightDp); + desiredWindowWidth = mWinFrame.width(); + desiredWindowHeight = mWinFrame.height(); } // We used to use the following condition to choose 32 bits drawing caches: |