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

Merge "PiP Transition: Only allow TRANSIT_PIP and TRANSIT_OPEN types for enter animation." into sc-v2-dev

Browse Source
This commit is contained in:
Ben Lin
2021-08-09 04:36:54 +00:00
committed by Android (Google) Code Review
parent 4adf760c08 7fb1c306a6
commit 4c06d013b5
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,6 +19,7 @@ package com.android.wm.shell.pip;
import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED; import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
import static android.util.RotationUtils.deltaRotation; import static android.util.RotationUtils.deltaRotation;
import static android.view.WindowManager.TRANSIT_OPEN;
import static android.view.WindowManager.TRANSIT_PIP; import static android.view.WindowManager.TRANSIT_PIP;
import static android.window.TransitionInfo.FLAG_IS_WALLPAPER; import static android.window.TransitionInfo.FLAG_IS_WALLPAPER;
@@ -126,6 +127,12 @@ public class PipTransition extends PipTransitionController {
return true; return true;
} }
// We only support TRANSIT_PIP type (from RootWindowContainer) or TRANSIT_OPEN (from apps
// that enter PiP instantly on opening, mostly from CTS/Flicker tests)
if (info.getType() != TRANSIT_PIP && info.getType() != TRANSIT_OPEN) {
return false;
}
// Search for an Enter PiP transition (along with a show wallpaper one) // Search for an Enter PiP transition (along with a show wallpaper one)
TransitionInfo.Change enterPip = null; TransitionInfo.Change enterPip = null;
TransitionInfo.Change wallpaper = null; TransitionInfo.Change wallpaper = null;