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

Commit 9b2063ca authored by kwaky's avatar kwaky
Browse files

Map bar type to new ITYPE_{SIDE}_MANDATORY_GESTURES_INSETs 

Bug: 167565741
Bug: 167288724
Test: atest WindowInsetsPolicy and atest SystemBarConfigs all passing

Change-Id: I767a423bc2437021af02c01a84fa3e1834413c1e
parent 8b9d4058

core/java/android/view/InsetsState.java

+32 −9
Original line number Diff line number Diff line
@@ -76,6 +76,10 @@ public class InsetsState implements Parcelable { 
            ITYPE_BOTTOM_GESTURES,

            ITYPE_LEFT_GESTURES,

            ITYPE_RIGHT_GESTURES,

            ITYPE_TOP_MANDATORY_GESTURES,

            ITYPE_BOTTOM_MANDATORY_GESTURES,

            ITYPE_LEFT_MANDATORY_GESTURES,

            ITYPE_RIGHT_MANDATORY_GESTURES,

            ITYPE_TOP_TAPPABLE_ELEMENT,

            ITYPE_BOTTOM_TAPPABLE_ELEMENT,

            ITYPE_LEFT_DISPLAY_CUTOUT,
@@ -104,20 +108,27 @@ public class InsetsState implements Parcelable { 
    public static final int ITYPE_BOTTOM_GESTURES = 4;

    public static final int ITYPE_LEFT_GESTURES = 5;

    public static final int ITYPE_RIGHT_GESTURES = 6;

    public static final int ITYPE_TOP_TAPPABLE_ELEMENT = 7;

    public static final int ITYPE_BOTTOM_TAPPABLE_ELEMENT = 8;



    public static final int ITYPE_LEFT_DISPLAY_CUTOUT = 9;

    public static final int ITYPE_TOP_DISPLAY_CUTOUT = 10;

    public static final int ITYPE_RIGHT_DISPLAY_CUTOUT = 11;

    public static final int ITYPE_BOTTOM_DISPLAY_CUTOUT = 12;

    /** Additional gesture inset types that map into {@link Type.MANDATORY_SYSTEM_GESTURES}. */

    public static final int ITYPE_TOP_MANDATORY_GESTURES = 7;

    public static final int ITYPE_BOTTOM_MANDATORY_GESTURES = 8;

    public static final int ITYPE_LEFT_MANDATORY_GESTURES = 9;

    public static final int ITYPE_RIGHT_MANDATORY_GESTURES = 10;



    public static final int ITYPE_TOP_TAPPABLE_ELEMENT = 11;

    public static final int ITYPE_BOTTOM_TAPPABLE_ELEMENT = 12;



    public static final int ITYPE_LEFT_DISPLAY_CUTOUT = 13;

    public static final int ITYPE_TOP_DISPLAY_CUTOUT = 14;

    public static final int ITYPE_RIGHT_DISPLAY_CUTOUT = 15;

    public static final int ITYPE_BOTTOM_DISPLAY_CUTOUT = 16;



    /** Input method window. */

    public static final int ITYPE_IME = 13;

    public static final int ITYPE_IME = 17;



    /** Additional system decorations inset type. */

    public static final int ITYPE_CLIMATE_BAR = 14;

    public static final int ITYPE_EXTRA_NAVIGATION_BAR = 15;

    public static final int ITYPE_CLIMATE_BAR = 18;

    public static final int ITYPE_EXTRA_NAVIGATION_BAR = 19;



    static final int LAST_TYPE = ITYPE_EXTRA_NAVIGATION_BAR;

    public static final int SIZE = LAST_TYPE + 1;
@@ -491,6 +502,10 @@ public class InsetsState implements Parcelable { 
                return Type.IME;

            case ITYPE_TOP_GESTURES:

            case ITYPE_BOTTOM_GESTURES:

            case ITYPE_TOP_MANDATORY_GESTURES:

            case ITYPE_BOTTOM_MANDATORY_GESTURES:

            case ITYPE_LEFT_MANDATORY_GESTURES:

            case ITYPE_RIGHT_MANDATORY_GESTURES:

                return Type.MANDATORY_SYSTEM_GESTURES;

            case ITYPE_LEFT_GESTURES:

            case ITYPE_RIGHT_GESTURES:
@@ -550,6 +565,14 @@ public class InsetsState implements Parcelable { 
                return "ITYPE_LEFT_GESTURES";

            case ITYPE_RIGHT_GESTURES:

                return "ITYPE_RIGHT_GESTURES";

            case ITYPE_TOP_MANDATORY_GESTURES:

                return "ITYPE_TOP_MANDATORY_GESTURES";

            case ITYPE_BOTTOM_MANDATORY_GESTURES:

                return "ITYPE_BOTTOM_MANDATORY_GESTURES";

            case ITYPE_LEFT_MANDATORY_GESTURES:

                return "ITYPE_LEFT_MANDATORY_GESTURES";

            case ITYPE_RIGHT_MANDATORY_GESTURES:

                return "ITYPE_RIGHT_MANDATORY_GESTURES";

            case ITYPE_TOP_TAPPABLE_ELEMENT:

                return "ITYPE_TOP_TAPPABLE_ELEMENT";

            case ITYPE_BOTTOM_TAPPABLE_ELEMENT:

packages/CarSystemUI/src/com/android/systemui/car/navigationbar/SystemBarConfigs.java

+6 −4
Original line number Diff line number Diff line
@@ -96,9 +96,11 @@ public class SystemBarConfigs { 


        populateMaps();

        readConfigs();



        checkEnabledBarsHaveUniqueBarTypes();

        checkSystemBarEnabledForNotificationPanel();

        checkHideBottomBarForKeyboardConfigSync();



        setInsetPaddingsForOverlappingCorners();

        sortSystemBarSidesByZOrder();

    }
@@ -153,10 +155,10 @@ public class SystemBarConfigs { 
        BAR_TITLE_MAP.put(LEFT, "LeftCarSystemBar");

        BAR_TITLE_MAP.put(RIGHT, "RightCarSystemBar");



        BAR_GESTURE_MAP.put(TOP, InsetsState.ITYPE_TOP_GESTURES);

        BAR_GESTURE_MAP.put(BOTTOM, InsetsState.ITYPE_BOTTOM_GESTURES);

        BAR_GESTURE_MAP.put(LEFT, InsetsState.ITYPE_LEFT_GESTURES);

        BAR_GESTURE_MAP.put(RIGHT, InsetsState.ITYPE_RIGHT_GESTURES);

        BAR_GESTURE_MAP.put(TOP, InsetsState.ITYPE_TOP_MANDATORY_GESTURES);

        BAR_GESTURE_MAP.put(BOTTOM, InsetsState.ITYPE_BOTTOM_MANDATORY_GESTURES);

        BAR_GESTURE_MAP.put(LEFT, InsetsState.ITYPE_LEFT_MANDATORY_GESTURES);

        BAR_GESTURE_MAP.put(RIGHT, InsetsState.ITYPE_RIGHT_MANDATORY_GESTURES);

    }



    private void readConfigs() {