diff options
| author | kwaky <kwaky@google.com> | 2020-09-11 10:52:36 -0700 |
|---|---|---|
| committer | kwaky <kwaky@google.com> | 2020-09-22 11:05:56 -0700 |
| commit | 9b2063caafecf2761fb8c24ab86e125fafa610a8 (patch) | |
| tree | 102326517036b47ff2958526ea0556a3a5233ec0 /packages/CarSystemUI | |
| parent | 8b9d40586b2ca36a94460775a6cd6b0034b8855d (diff) | |
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
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 694ae6d93b93..a3389a0b97e8 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() { |