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

Commit 4294ebdb authored by Youngjun Kwak's avatar Youngjun Kwak Committed by Automerger Merge Worker
Browse files

Merge "Map bar type to new ITYPE_{SIDE}_MANDATORY_GESTURES_INSETs" into... 

Merge "Map bar type to new ITYPE_{SIDE}_MANDATORY_GESTURES_INSETs" into rvc-qpr-dev am: 4d714cb8 am: dcfa722f

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

Change-Id: I23a25bddc218d0ceff66cb891d61de68abc289fc
parents d347b185 dcfa722f

core/java/android/view/InsetsState.java

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

            ITYPE_BOTTOM_GESTURES,

            ITYPE_LEFT_GESTURES,

            ITYPE_LEFT_GESTURES,

            ITYPE_RIGHT_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_TOP_TAPPABLE_ELEMENT,

            ITYPE_BOTTOM_TAPPABLE_ELEMENT,

            ITYPE_BOTTOM_TAPPABLE_ELEMENT,

            ITYPE_LEFT_DISPLAY_CUTOUT,

            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_BOTTOM_GESTURES = 4;

    public static final int ITYPE_LEFT_GESTURES = 5;

    public static final int ITYPE_LEFT_GESTURES = 5;

    public static final int ITYPE_RIGHT_GESTURES = 6;

    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;

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

    public static final int ITYPE_TOP_DISPLAY_CUTOUT = 10;

    public static final int ITYPE_TOP_MANDATORY_GESTURES = 7;

    public static final int ITYPE_RIGHT_DISPLAY_CUTOUT = 11;

    public static final int ITYPE_BOTTOM_MANDATORY_GESTURES = 8;

    public static final int ITYPE_BOTTOM_DISPLAY_CUTOUT = 12;

    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. */

    /** Input method window. */

    public static final int ITYPE_IME = 13;

    public static final int ITYPE_IME = 17;





    /** Additional system decorations inset type. */

    /** Additional system decorations inset type. */

    public static final int ITYPE_CLIMATE_BAR = 14;

    public static final int ITYPE_CLIMATE_BAR = 18;

    public static final int ITYPE_EXTRA_NAVIGATION_BAR = 15;

    public static final int ITYPE_EXTRA_NAVIGATION_BAR = 19;





    static final int LAST_TYPE = ITYPE_EXTRA_NAVIGATION_BAR;

    static final int LAST_TYPE = ITYPE_EXTRA_NAVIGATION_BAR;

    public static final int SIZE = LAST_TYPE + 1;

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

                return Type.IME;

            case ITYPE_TOP_GESTURES:

            case ITYPE_TOP_GESTURES:

            case ITYPE_BOTTOM_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;

                return Type.MANDATORY_SYSTEM_GESTURES;

            case ITYPE_LEFT_GESTURES:

            case ITYPE_LEFT_GESTURES:

            case ITYPE_RIGHT_GESTURES:

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

                return "ITYPE_LEFT_GESTURES";

            case ITYPE_RIGHT_GESTURES:

            case ITYPE_RIGHT_GESTURES:

                return "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:

            case ITYPE_TOP_TAPPABLE_ELEMENT:

                return "ITYPE_TOP_TAPPABLE_ELEMENT";

                return "ITYPE_TOP_TAPPABLE_ELEMENT";

            case ITYPE_BOTTOM_TAPPABLE_ELEMENT:

            case ITYPE_BOTTOM_TAPPABLE_ELEMENT:

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

+6 −4
Original line number Original line Diff line number Diff line
@@ -97,10 +97,12 @@ public class SystemBarConfigs { 




        populateMaps();

        populateMaps();

        readConfigs();

        readConfigs();



        checkEnabledBarsHaveUniqueBarTypes();

        checkEnabledBarsHaveUniqueBarTypes();

        checkAllOverlappingBarsHaveDifferentZOrders();

        checkAllOverlappingBarsHaveDifferentZOrders();

        checkSystemBarEnabledForNotificationPanel();

        checkSystemBarEnabledForNotificationPanel();

        checkHideBottomBarForKeyboardConfigSync();

        checkHideBottomBarForKeyboardConfigSync();



        setInsetPaddingsForOverlappingCorners();

        setInsetPaddingsForOverlappingCorners();

        sortSystemBarSidesByZOrder();

        sortSystemBarSidesByZOrder();

    }

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

        BAR_TITLE_MAP.put(LEFT, "LeftCarSystemBar");

        BAR_TITLE_MAP.put(RIGHT, "RightCarSystemBar");

        BAR_TITLE_MAP.put(RIGHT, "RightCarSystemBar");





        BAR_GESTURE_MAP.put(TOP, InsetsState.ITYPE_TOP_GESTURES);

        BAR_GESTURE_MAP.put(TOP, InsetsState.ITYPE_TOP_MANDATORY_GESTURES);

        BAR_GESTURE_MAP.put(BOTTOM, InsetsState.ITYPE_BOTTOM_GESTURES);

        BAR_GESTURE_MAP.put(BOTTOM, InsetsState.ITYPE_BOTTOM_MANDATORY_GESTURES);

        BAR_GESTURE_MAP.put(LEFT, InsetsState.ITYPE_LEFT_GESTURES);

        BAR_GESTURE_MAP.put(LEFT, InsetsState.ITYPE_LEFT_MANDATORY_GESTURES);

        BAR_GESTURE_MAP.put(RIGHT, InsetsState.ITYPE_RIGHT_GESTURES);

        BAR_GESTURE_MAP.put(RIGHT, InsetsState.ITYPE_RIGHT_MANDATORY_GESTURES);

    }

    }





    private void readConfigs() {

    private void readConfigs() {