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

Commit fc5aebdb authored by Riddle Hsu's avatar Riddle Hsu Committed by Android (Google) Code Review
Browse files

Merge "Avoid entering pip activity from affecting sysui appearance" into main

parents 9b59e833 a61e1c1e

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -5262,7 +5262,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 




    boolean canAffectSystemUiFlags() {

    boolean canAffectSystemUiFlags() {

        return task != null && task.canAffectSystemUiFlags() && isVisible()

        return task != null && task.canAffectSystemUiFlags() && isVisible()

                && !inPinnedWindowingMode();

                && !mWaitForEnteringPinnedMode && !inPinnedWindowingMode();

    }

    }





    @Override

    @Override

services/tests/wmtests/src/com/android/server/wm/RootWindowContainerTests.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -362,6 +362,8 @@ public class RootWindowContainerTests extends WindowTestsBase { 
        // Ensure a task has moved over.

        // Ensure a task has moved over.

        ensureTaskPlacement(task, activity);

        ensureTaskPlacement(task, activity);

        assertTrue(task.inPinnedWindowingMode());

        assertTrue(task.inPinnedWindowingMode());

        assertFalse("Entering PiP activity must not affect SysUiFlags",

                activity.canAffectSystemUiFlags());





        // The activity with fixed orientation should not apply letterbox when entering PiP.

        // The activity with fixed orientation should not apply letterbox when entering PiP.

        final int requestedOrientation = task.getConfiguration().orientation

        final int requestedOrientation = task.getConfiguration().orientation