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

Commit 9a161493 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... 

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

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



Change-Id: Ie35b64a7d333af52fd51edf12a8fb7912c46eb0b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b65f2462 0d1277a8

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());

    }