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

Merge "Temporarily disable consecutive visibility assertion of close pip" into udc-dev

Browse Source
This commit is contained in:
Riddle Hsu
2023-05-10 14:59:05 +00:00
committed by Android (Google) Code Review
parent 2e42353329 86d8cb8b05
commit cafd5cd8cb
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java
View File

@@ -888,9 +888,6 @@ public class PipTransition extends PipTransitionController {
// setting bounds. // setting bounds.
animator.setPipTransactionHandler(mTransactionConsumer).applySurfaceControlTransaction( animator.setPipTransactionHandler(mTransactionConsumer).applySurfaceControlTransaction(
leash, finishTransaction, PipAnimationController.FRACTION_END); leash, finishTransaction, PipAnimationController.FRACTION_END);
// Remove the workaround after fixing ClosePipBySwipingDownTest that detects the shadow
// as unexpected visible.
finishTransaction.setShadowRadius(leash, 0);
// Start to animate enter PiP. // Start to animate enter PiP.
animator.setPipTransactionHandler(mPipOrganizer.getPipTransactionHandler()).start(); animator.setPipTransactionHandler(mPipOrganizer.getPipTransactionHandler()).start();
} }

10
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ClosePipBySwipingDownTest.kt
View File

@@ -95,4 +95,14 @@ open class ClosePipBySwipingDownTest(flicker: FlickerTest) : ClosePipTransition(
fun focusDoesNotChange() { fun focusDoesNotChange() {
flicker.assertEventLog { this.focusDoesNotChange() } flicker.assertEventLog { this.focusDoesNotChange() }
} }
@Test
override fun visibleLayersShownMoreThanOneConsecutiveEntry() {
// TODO(b/270678766): Enable the assertion after fixing the case:
// Assume the PiP task has shadow.
// 1. The PiP activity is visible -> Task is invisible because it is occluded by activity.
// 2. Activity becomes invisible -> Task is visible because it has shadow.
// 3. Task is moved outside screen -> Task becomes invisible.
// The assertion is triggered for 2 that the Task is only visible in one frame.
}
} }