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

Commit 69cef364 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Do not letterbox the activity in PiP mode" into udc-dev am: 41667fa9 

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



Change-Id: I5d71b9b40732c0d2bf3a6b8cf3251fd64ba192b6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents efe82e5a 41667fa9

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

+3 −1
Original line number Diff line number Diff line
@@ -3883,13 +3883,15 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
    }



    /**

     * @return true if activity bounds are letterboxed or letterboxed for diplay cutout.

     * @return {@code true} if activity bounds are letterboxed or letterboxed for display cutout.

     * Note that it's always {@code false} if the activity is in pip mode.

     *

     * <p>Note that letterbox UI may not be shown even when this returns {@code true}. See {@link

     * LetterboxUiController#shouldShowLetterboxUi} for more context.

     */

    boolean areAppWindowBoundsLetterboxed() {

        return mActivityRecord != null

                && !mActivityRecord.inPinnedWindowingMode()

                && (mActivityRecord.areBoundsLetterboxed() || isLetterboxedForDisplayCutout());

    }