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

Merge "Ensure bounds animination for expanding PiP window" into qt-qpr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-09-13 04:06:48 +00:00
committed by Android (Google) Code Review
parent 6e2b06a155 f0b5fb17fb
commit 5daf6c480b
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/app/Activity.java
View File

@@ -944,6 +944,10 @@ public class Activity extends ContextThemeWrapper
/** @hide */
boolean mEnterAnimationComplete;
/** Track last dispatched multi-window and PiP mode to client, internal debug purpose **/
private Boolean mLastDispatchedIsInMultiWindowMode;
private Boolean mLastDispatchedIsInPictureInPictureMode;
private static native String getDlWarning();
/** Return the intent that started this activity. */
@@ -6999,6 +7003,10 @@ public class Activity extends ContextThemeWrapper
writer.print(mResumed); writer.print(" mStopped=");
writer.print(mStopped); writer.print(" mFinished=");
writer.println(mFinished);
writer.print(innerPrefix); writer.print("mLastDispatchedIsInMultiWindowMode=");
writer.print(mLastDispatchedIsInMultiWindowMode);
writer.print(" mLastDispatchedIsInPictureInPictureMode=");
writer.println(mLastDispatchedIsInPictureInPictureMode);
writer.print(innerPrefix); writer.print("mChangingConfigurations=");
writer.println(mChangingConfigurations);
writer.print(innerPrefix); writer.print("mCurrentConfig=");
@@ -8078,6 +8086,7 @@ public class Activity extends ContextThemeWrapper
if (mWindow != null) {
mWindow.onMultiWindowModeChanged();
}
mLastDispatchedIsInMultiWindowMode = isInMultiWindowMode;
onMultiWindowModeChanged(isInMultiWindowMode, newConfig);
}
@@ -8090,6 +8099,7 @@ public class Activity extends ContextThemeWrapper
if (mWindow != null) {
mWindow.onPictureInPictureModeChanged(isInPictureInPictureMode);
}
mLastDispatchedIsInPictureInPictureMode = isInPictureInPictureMode;
onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig);
}

5
services/core/java/com/android/server/wm/TaskStack.java
View File

@@ -1747,6 +1747,11 @@ public class TaskStack extends WindowContainer<Task> implements
if (toBounds.width() == fromBounds.width()
&& toBounds.height() == fromBounds.height()) {
intendedAnimationType = BoundsAnimationController.BOUNDS;
} else if (!fromFullscreen && !toBounds.equals(fromBounds)) {
// intendedAnimationType may have been reset at the end of RecentsAnimation,
// force it to BOUNDS type if we know for certain we're animating to
// a different bounds, especially for expand and collapse of PiP window.
intendedAnimationType = BoundsAnimationController.BOUNDS;
}
}