diff options
| author | Youngjun Kwak <kwaky@google.com> | 2020-09-24 15:19:11 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-09-24 15:19:11 +0000 |
| commit | 4d714cb8e9d494999cc3518dfefaf6e36b405777 (patch) | |
| tree | cbf9522d919a8570f3c9eaeab6805cb10874d930 /packages/CarSystemUI | |
| parent | 3b6bdffa4497b54f8c74528fcff25d72dcc285de (diff) | |
| parent | 9b2063caafecf2761fb8c24ab86e125fafa610a8 (diff) | |
Merge "Map bar type to new ITYPE_{SIDE}_MANDATORY_GESTURES_INSETs" into rvc-qpr-dev
Diffstat (limited to 'packages/CarSystemUI')
| -rw-r--r-- | packages/CarSystemUI/src/com/android/systemui/car/navigationbar/SystemBarConfigs.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/packages/CarSystemUI/src/com/android/systemui/car/navigationbar/SystemBarConfigs.java b/packages/CarSystemUI/src/com/android/systemui/car/navigationbar/SystemBarConfigs.java index e72df6bcf28f..2efa2b3d4870 100644 --- a/packages/CarSystemUI/src/com/android/systemui/car/navigationbar/SystemBarConfigs.java +++ b/packages/CarSystemUI/src/com/android/systemui/car/navigationbar/SystemBarConfigs.java @@ -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() { |