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

Merge "Choose opaque activity for fixed rotation with entering pip" into sc-v2-dev am: fd566b803d

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16221430

Change-Id: I6489c88e228d475a0d0a6b1ded76c689c76bb4b1
This commit is contained in:
TreeHugger Robot
2021-11-11 04:42:10 +00:00
committed by Automerger Merge Worker
parent d4e9e66ead fd566b803d
commit 4209eaa2e3
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/wm/PinnedTaskController.java
View File

@@ -17,7 +17,6 @@
package com.android.server.wm; package com.android.server.wm;
import static android.app.WindowConfiguration.ROTATION_UNDEFINED; import static android.app.WindowConfiguration.ROTATION_UNDEFINED;
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WITH_CLASS_NAME;
import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM; import static com.android.server.wm.WindowManagerDebugConfig.TAG_WM;
@@ -173,10 +172,8 @@ class PinnedTaskController {
* to avoid flickering when running PiP animation across different orientations. * to avoid flickering when running PiP animation across different orientations.
*/ */
void deferOrientationChangeForEnteringPipFromFullScreenIfNeeded() { void deferOrientationChangeForEnteringPipFromFullScreenIfNeeded() {
final Task topFullscreenTask = mDisplayContent.getDefaultTaskDisplayArea() final ActivityRecord topFullscreen = mDisplayContent.getActivity(
.getTopRootTaskInWindowingMode(WINDOWING_MODE_FULLSCREEN); a -> a.fillsParent() && !a.getTask().inMultiWindowMode());
final ActivityRecord topFullscreen = topFullscreenTask != null
? topFullscreenTask.topRunningActivity() : null;
if (topFullscreen == null || topFullscreen.hasFixedRotationTransform()) { if (topFullscreen == null || topFullscreen.hasFixedRotationTransform()) {
return; return;
} }