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

Commit 46af1434 authored by Shawn Lin's avatar Shawn Lin Committed by Android (Google) Code Review
Browse files

Merge "Allow passing cutout to the hierarchy in shortEdge mode"

parents 51a24c8a d647897f

core/java/android/view/ViewRootImpl.java

+9 −3
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATIO 
import static android.view.WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS;

import static android.view.WindowManager.LayoutParams.LAST_APPLICATION_WINDOW;

import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;

import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_APPEARANCE_CONTROLLED;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_BEHAVIOR_CONTROLLED;

import static android.view.WindowManager.LayoutParams.PRIVATE_FLAG_FIT_INSETS_CONTROLLED;
@@ -2237,9 +2238,7 @@ public final class ViewRootImpl implements ViewParent, 
        Trace.traceBegin(Trace.TRACE_TAG_VIEW, "dispatchApplyInsets");

        mApplyInsetsRequested = false;

        WindowInsets insets = getWindowInsets(true /* forceConstruct */);

        final boolean dispatchCutout = (mWindowAttributes.layoutInDisplayCutoutMode

                == LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS);

        if (!dispatchCutout) {

        if (!shouldDispatchCutout()) {

            // Window is either not laid out in cutout or the status bar inset takes care of

            // clearing the cutout, so we don't need to dispatch the cutout to the hierarchy.

            insets = insets.consumeDisplayCutout();
@@ -2248,6 +2247,13 @@ public final class ViewRootImpl implements ViewParent, 
        Trace.traceEnd(Trace.TRACE_TAG_VIEW);

    }



    private boolean shouldDispatchCutout() {

        return mWindowAttributes.layoutInDisplayCutoutMode

                        == LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS

                || mWindowAttributes.layoutInDisplayCutoutMode

                        == LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;

    }



    private void updateVisibleInsets() {

        Rect visibleInsets = mInsetsController.calculateVisibleInsets(mPendingVisibleInsets,

                mWindowAttributes.softInputMode);