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

Merge "Make PiP window visible when user launches PiP in landscape mode" into qt-dev

Browse Source 
am: 94a1aafcaa

Change-Id: I76cbf9b242eee489bbad5344c4c4ff0ef6f8b50c
This commit is contained in:
Tracy Zhou
2019-06-10 14:34:40 -07:00
committed by android-build-merger
parent 3d4f87f021 94a1aafcaa
commit dc7c33241c
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1640,6 +1640,7 @@ public class TaskStack extends WindowContainer<Task> implements
if (mAnimationType == BoundsAnimationController.FADE_IN) { if (mAnimationType == BoundsAnimationController.FADE_IN) {
setPinnedStackAlpha(1f); setPinnedStackAlpha(1f);
mActivityStack.mService.notifyPinnedStackAnimationEnded(); mActivityStack.mService.notifyPinnedStackAnimationEnded();
return;
} }
if (finalStackSize != null && !mCancelCurrentBoundsAnimation) { if (finalStackSize != null && !mCancelCurrentBoundsAnimation) {
@@ -1935,14 +1936,11 @@ public class TaskStack extends WindowContainer<Task> implements
public boolean setPinnedStackAlpha(float alpha) { public boolean setPinnedStackAlpha(float alpha) {
// Hold the lock since this is called from the BoundsAnimator running on the UiThread // Hold the lock since this is called from the BoundsAnimator running on the UiThread
synchronized (mWmService.mGlobalLock) { synchronized (mWmService.mGlobalLock) {
if (mCancelCurrentBoundsAnimation) { getPendingTransaction().setAlpha(getSurfaceControl(),
return false; mCancelCurrentBoundsAnimation ? 1 : alpha);
}
getPendingTransaction().setAlpha(getSurfaceControl(), alpha);
scheduleAnimation(); scheduleAnimation();
return !mCancelCurrentBoundsAnimation;
} }
return true;
} }
public DisplayInfo getDisplayInfo() { public DisplayInfo getDisplayInfo() {