Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4209eaa2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I6489c88e228d475a0d0a6b1ded76c689c76bb4b1
parents d4e9e66e fd566b80

services/core/java/com/android/server/wm/PinnedTaskController.java

+2 −5
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.server.wm;



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_WM;
@@ -173,10 +172,8 @@ class PinnedTaskController { 
     * to avoid flickering when running PiP animation across different orientations.

     */

    void deferOrientationChangeForEnteringPipFromFullScreenIfNeeded() {

        final Task topFullscreenTask = mDisplayContent.getDefaultTaskDisplayArea()

                .getTopRootTaskInWindowingMode(WINDOWING_MODE_FULLSCREEN);

        final ActivityRecord topFullscreen = topFullscreenTask != null

                ? topFullscreenTask.topRunningActivity() : null;

        final ActivityRecord topFullscreen = mDisplayContent.getActivity(

                a -> a.fillsParent() && !a.getTask().inMultiWindowMode());

        if (topFullscreen == null || topFullscreen.hasFixedRotationTransform()) {

            return;

        }