diff options
author | Winson Chung <winsonc@google.com> | 2018-08-20 21:57:42 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-08-20 21:57:42 +0000 |
commit | 2d41269fa3e78b1e59dfecc4b3ebf004056235b6 (patch) | |
tree | 61bd8f8ecb59fb5a14f69a72dd02813ed2ed5252 | |
parent | 2a7122cf9d51280cf677cb3849452d25a9f47c0f (diff) | |
parent | fe0a59b076e849f5ad4168474e48a78a18ed6612 (diff) | |
download | base-2d41269fa3e78b1e59dfecc4b3ebf004056235b6.tar.gz |
Merge "Workaround regression in multiwindow mode change callback" into pi-dev
-rw-r--r-- | services/core/java/com/android/server/am/ActivityRecord.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/am/ActivityRecord.java b/services/core/java/com/android/server/am/ActivityRecord.java index 75f27231c976..60f79f720242 100644 --- a/services/core/java/com/android/server/am/ActivityRecord.java +++ b/services/core/java/com/android/server/am/ActivityRecord.java @@ -694,9 +694,13 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo final boolean inPictureInPictureMode = inPinnedWindowingMode() && targetStackBounds != null; if (inPictureInPictureMode != mLastReportedPictureInPictureMode || forceUpdate) { // Picture-in-picture mode changes also trigger a multi-window mode change as well, so - // update that here in order + // update that here in order. Set the last reported MW state to the same as the PiP + // state since we haven't yet actually resized the task (these callbacks need to + // preceed the configuration change from the resiez. + // TODO(110009072): Once we move these callbacks to the client, remove all logic related + // to forcing the update of the picture-in-picture mode as a part of the PiP animation. mLastReportedPictureInPictureMode = inPictureInPictureMode; - mLastReportedMultiWindowMode = inMultiWindowMode(); + mLastReportedMultiWindowMode = inPictureInPictureMode; final Configuration newConfig = task.computeNewOverrideConfigurationForBounds( targetStackBounds, null); schedulePictureInPictureModeChanged(newConfig); |