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

Commit f8054b25 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Refine API of getting window visible display frame" into main

parents d17175f6 4d379cbf

core/java/android/view/InsetsState.java

+2 −2
Original line number Diff line number Diff line
@@ -296,8 +296,8 @@ public class InsetsState implements Parcelable { 
            @SoftInputModeFlags int softInputMode, int windowFlags) {

        final int softInputAdjustMode = softInputMode & SOFT_INPUT_MASK_ADJUST;

        final int visibleInsetsTypes = softInputAdjustMode != SOFT_INPUT_ADJUST_NOTHING

                ? systemBars() | ime()

                : systemBars();

                ? systemBars() | displayCutout() | ime()

                : systemBars() | displayCutout();

        @InsetsType int forceConsumingTypes = 0;

        Insets insets = Insets.NONE;

        for (int i = mSources.size() - 1; i >= 0; i--) {

core/java/android/view/View.java

+1 −1
Original line number Diff line number Diff line
@@ -17184,7 +17184,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        final WindowManager windowManager = mContext.getSystemService(WindowManager.class);

        final WindowMetrics metrics = windowManager.getMaximumWindowMetrics();

        final Insets insets = metrics.getWindowInsets().getInsets(

                WindowInsets.Type.navigationBars() | WindowInsets.Type.displayCutout());

                WindowInsets.Type.systemBars() | WindowInsets.Type.displayCutout());

        outRect.set(metrics.getBounds());

        outRect.inset(insets);

        outRect.offsetTo(0, 0);