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

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

Merge "WindowInsets: Properly initialize systemGestureInsets"

parents 2eeb3ac8 a5355867

core/java/android/view/InsetsState.java

+4 −0
Original line number Diff line number Diff line
@@ -142,6 +142,10 @@ public class InsetsState implements Parcelable { 
                && legacyContentInsets != null && legacyStableInsets != null) {

            WindowInsets.assignCompatInsets(typeInsetsMap, legacyContentInsets);

            WindowInsets.assignCompatInsets(typeMaxInsetsMap, legacyStableInsets);



            // TODO: set system gesture insets based on actual system gesture area.

            typeInsetsMap[Type.indexOf(Type.systemGestures())] = Insets.of(legacyContentInsets);

            typeMaxInsetsMap[Type.indexOf(Type.systemGestures())] = Insets.of(legacyContentInsets);

        }

        for (int type = FIRST_TYPE; type <= LAST_TYPE; type++) {

            InsetsSource source = mSources.get(type);

core/java/android/view/WindowInsets.java

+4 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import static android.view.WindowInsets.Type.TOP_BAR; 
import static android.view.WindowInsets.Type.all;

import static android.view.WindowInsets.Type.compatSystemInsets;

import static android.view.WindowInsets.Type.indexOf;

import static android.view.WindowInsets.Type.systemGestures;



import android.annotation.IntDef;

import android.annotation.IntRange;
@@ -220,6 +221,8 @@ public final class WindowInsets { 
        }

        Insets[] typeInsetMap = new Insets[SIZE];

        assignCompatInsets(typeInsetMap, insets);

        // TODO: set system gesture insets based on actual system gesture area.

        typeInsetMap[indexOf(systemGestures())] = Insets.of(insets);

        return typeInsetMap;

    }
@@ -229,7 +232,6 @@ public final class WindowInsets { 
    static void assignCompatInsets(Insets[] typeInsetMap, Rect insets) {

        typeInsetMap[indexOf(TOP_BAR)] = Insets.of(0, insets.top, 0, 0);

        typeInsetMap[indexOf(SIDE_BARS)] = Insets.of(insets.left, 0, insets.right, insets.bottom);

        typeInsetMap[indexOf(SYSTEM_GESTURES)] = Insets.of(insets);

    }



    private static boolean[] createCompatVisibilityMap(@Nullable Insets[] typeInsetMap) {
@@ -675,6 +677,7 @@ public final class WindowInsets { 
    public String toString() {

        return "WindowInsets{systemWindowInsets=" + getSystemWindowInsets()

                + " stableInsets=" + getStableInsets()

                + " sysGestureInsets=" + getSystemGestureInsets()

                + (mDisplayCutout != null ? " cutout=" + mDisplayCutout : "")

                + (isRound() ? " round" : "")

                + "}";