diff options
| author | Heemin Seog <hseog@google.com> | 2020-09-23 15:44:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-23 15:44:28 +0000 |
| commit | bda41b51b5aae73e4d89f7bb3c4141b442176d9c (patch) | |
| tree | 828766d815f419fc3475d1c3df5d065d691f3403 /packages/CarSystemUI/res | |
| parent | ea71e7b9e045e706a6967473a043f142b54653fb (diff) | |
| parent | 7c6a4eee44e31940244a1e783dd20ac123d36ac6 (diff) | |
Merge "Ensure notif panel behavior in immersive mode" into rvc-qpr-dev am: 7c6a4eee44
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12642386
Change-Id: I63312ced8839331be56ff96a93716ba24a73fba0
Diffstat (limited to 'packages/CarSystemUI/res')
| -rw-r--r-- | packages/CarSystemUI/res/layout/sysui_overlay_window.xml | 3 | ||||
| -rw-r--r-- | packages/CarSystemUI/res/values/dimens.xml | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/packages/CarSystemUI/res/layout/sysui_overlay_window.xml b/packages/CarSystemUI/res/layout/sysui_overlay_window.xml index 2c9788955bfa..e7295aa6383d 100644 --- a/packages/CarSystemUI/res/layout/sysui_overlay_window.xml +++ b/packages/CarSystemUI/res/layout/sysui_overlay_window.xml @@ -25,7 +25,8 @@ <ViewStub android:id="@+id/notification_panel_stub" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout="@layout/notification_panel_container"/> + android:layout="@layout/notification_panel_container" + android:layout_marginBottom="@dimen/car_bottom_navigation_bar_height"/> <ViewStub android:id="@+id/keyguard_stub" android:layout_width="match_parent" diff --git a/packages/CarSystemUI/res/values/dimens.xml b/packages/CarSystemUI/res/values/dimens.xml index 8359dac6a30f..e8ac9e14eca1 100644 --- a/packages/CarSystemUI/res/values/dimens.xml +++ b/packages/CarSystemUI/res/values/dimens.xml @@ -194,6 +194,12 @@ <dimen name="car_navigation_bar_width">760dp</dimen> <dimen name="car_left_navigation_bar_width">96dp</dimen> <dimen name="car_right_navigation_bar_width">96dp</dimen> + <!-- In order to change the height of the bottom nav bar, overlay navigation_bar_height in + frameworks/base/core/res/res instead. --> + <dimen name="car_bottom_navigation_bar_height">@*android:dimen/navigation_bar_height</dimen> + <!-- In order to change the height of the top nav bar, overlay status_bar_height in + frameworks/base/core/res/res instead. --> + <dimen name="car_top_navigation_bar_height">@*android:dimen/status_bar_height</dimen> <dimen name="car_user_switcher_container_height">420dp</dimen> <!-- This must be the negative of car_user_switcher_container_height for the animation. --> |