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

Commit 12c5add6 authored by Charles Chen's avatar Charles Chen Committed by Automerger Merge Worker
Browse files

Merge "Fix primary activity untouchable with punch hole" into udc-dev am: 385ab324 

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



Change-Id: I57e56c40f9f46208dc2c87c263030c4462892fb8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 992f6196 385ab324

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

+3 −2
Original line number Diff line number Diff line
@@ -832,13 +832,14 @@ final class LetterboxUiController { 


            // Get the bounds of the "space-to-fill". The transformed bounds have the highest

            // priority because the activity is launched in a rotated environment. In multi-window

            // mode, the task-level represents this. In fullscreen-mode, the task container does

            // mode, the taskFragment-level represents this for both split-screen

            // and activity-embedding. In fullscreen-mode, the task container does

            // (since the orientation letterbox is also applied to the task).

            final Rect transformedBounds = mActivityRecord.getFixedRotationTransformDisplayBounds();

            final Rect spaceToFill = transformedBounds != null

                    ? transformedBounds

                    : mActivityRecord.inMultiWindowMode()

                            ? mActivityRecord.getTask().getBounds()

                            ? mActivityRecord.getTaskFragment().getBounds()

                            : mActivityRecord.getRootTask().getParent().getBounds();

            // In case of translucent activities an option is to use the WindowState#getFrame() of

            // the first opaque activity beneath. In some cases (e.g. an opaque activity is using