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

Merge "Only restash TV PiP if necessary on immediate placement"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-08-04 14:22:22 +00:00
committed by Android (Google) Code Review
parent 5b2abf1cde 63cd654af2
commit eed79bf6ec
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipBoundsController.java
View File

@@ -122,9 +122,9 @@ public class TvPipBoundsController {
cancelScheduledPlacement();
applyPlacementBounds(placement.getUnstashedBounds(), animationDuration);
} else if (immediate) {
boolean shouldStash = mUnstashRunnable != null || placement.getTriggerStash();
cancelScheduledPlacement();
applyPlacementBounds(placement.getBounds(), animationDuration);
scheduleUnstashIfNeeded(placement);
applyPlacement(placement, shouldStash, animationDuration);
} else {
applyPlacementBounds(mCurrentPlacementBounds, animationDuration);
schedulePinnedStackPlacement(placement, animationDuration);
@@ -176,22 +176,21 @@ public class TvPipBoundsController {
"%s: applyPendingPlacement()", TAG);
}
if (mPendingPlacement != null) {
if (mPendingStash) {
mPendingStash = false;
scheduleUnstashIfNeeded(mPendingPlacement);
}
applyPlacement(mPendingPlacement, mPendingStash, mPendingPlacementAnimationDuration);
mPendingStash = false;
mPendingPlacement = null;
}
}
if (mUnstashRunnable != null) {
// currently stashed, use stashed pos
applyPlacementBounds(mPendingPlacement.getBounds(),
mPendingPlacementAnimationDuration);
} else {
applyPlacementBounds(mPendingPlacement.getUnstashedBounds(),
mPendingPlacementAnimationDuration);
}
private void applyPlacement(@NonNull final Placement placement, boolean shouldStash,
int animationDuration) {
if (placement.getStashType() != STASH_TYPE_NONE && shouldStash) {
scheduleUnstashIfNeeded(placement);
}
mPendingPlacement = null;
Rect bounds =
mUnstashRunnable != null ? placement.getBounds() : placement.getUnstashedBounds();
applyPlacementBounds(bounds, animationDuration);
}
void onPipDismissed() {

10
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/pip/tv/TvPipBoundsControllerTest.kt
View File

@@ -178,6 +178,16 @@ class TvPipBoundsControllerTest {
assertMovementAt(time + STASH_DURATION, ANCHOR_BOUNDS)
}
@Test
fun testImmediatePlacement_DoNotStashIfAlreadyUnstashed() {
triggerImmediatePlacement(STASHED_PLACEMENT_RESTASH)
assertMovement(STASHED_BOUNDS)
assertMovementAt(time + STASH_DURATION, ANCHOR_BOUNDS)
triggerImmediatePlacement(STASHED_PLACEMENT)
assertNoMovementUpTo(time + FAR_FUTURE)
}
@Test
fun testInMoveMode_KeepAtAnchor() {
startMoveMode()