Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Force a relayout when task is resized while not drag resizing." into nyc-dev

Browse Source 
am: b6cd42a

* commit 'b6cd42a925136f6354555c9c1033d20fbaadd139':
  Force a relayout when task is resized while not drag resizing.

Change-Id: Ieed7be623a63a6385a55eb62ca5bd9254b7b2a2c
This commit is contained in:
Chong Zhang
2016-04-22 23:33:48 +00:00
committed by android-build-merger
parent cfc3be21a6 b6cd42a925
commit 954103966a
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -9161,7 +9161,8 @@ public class WindowManagerService extends IWindowManager.Stub
+ " " + w.mOutsets.toShortString() + " " + w.mOutsets.toShortString()
+ " surfaceResized=" + winAnimator.mSurfaceResized + " surfaceResized=" + winAnimator.mSurfaceResized
+ " configChanged=" + configChanged + " configChanged=" + configChanged
+ " dragResizingChanged=" + dragResizingChanged); + " dragResizingChanged=" + dragResizingChanged
+ " resizedWhileNotDragResizing=" + w.mResizedWhileNotDragResizing);
} }
// If it's a dead window left on screen, and the configuration changed, // If it's a dead window left on screen, and the configuration changed,

4
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -2266,9 +2266,11 @@ final class WindowState implements WindowManagerPolicy.WindowState {
private void dispatchResized(Rect frame, Rect overscanInsets, Rect contentInsets, private void dispatchResized(Rect frame, Rect overscanInsets, Rect contentInsets,
Rect visibleInsets, Rect stableInsets, Rect outsets, boolean reportDraw, Rect visibleInsets, Rect stableInsets, Rect outsets, boolean reportDraw,
Configuration newConfig) throws RemoteException { Configuration newConfig) throws RemoteException {
final boolean forceRelayout = isDragResizeChanged() || mResizedWhileNotDragResizing;
mClient.resized(frame, overscanInsets, contentInsets, visibleInsets, stableInsets, outsets, mClient.resized(frame, overscanInsets, contentInsets, visibleInsets, stableInsets, outsets,
reportDraw, newConfig, getBackdropFrame(frame), reportDraw, newConfig, getBackdropFrame(frame),
isDragResizeChanged() /* forceRelayout */, mPolicy.isNavBarForcedShownLw(this)); forceRelayout, mPolicy.isNavBarForcedShownLw(this));
mDragResizingChangeReported = true; mDragResizingChangeReported = true;
} }