From 224c81c6daa1f4fabebf42085b36bf8b83240034 Mon Sep 17 00:00:00 2001 From: Julia Kawano Date: Mon, 17 Aug 2020 23:24:16 +0000 Subject: [PATCH] Add username to status bar and update layout Update the status bar with the new UX designs: - Remove driver and passenger HVAC views - Add driver icon (placeholder) and username aligned to start of bar - Move system icons aligned to end of bar (previously next to clock) - Add AM/PM to clock HVAC will be moved into the navigation bar in a separate change. Test: manual - change to guest, change username, change to long username (truncates before clock view) Test: atest :carsysui-presubmit Bug: 162598687 Change-Id: I5b9095adce7fee0970e8b15d307f01eb4adf2b40 --- .../res/drawable/car_ic_user_icon.xml | 25 +++ .../res/layout/car_top_navigation_bar.xml | 100 ++++------- packages/CarSystemUI/res/values/colors.xml | 2 + packages/CarSystemUI/res/values/dimens.xml | 5 +- packages/CarSystemUI/res/values/styles.xml | 15 +- .../CarNavigationBarController.java | 6 + .../car/statusbar/UserNameViewController.java | 132 +++++++++++++++ .../CarNavigationBarControllerTest.java | 5 +- .../statusbar/UserNameViewControllerTest.java | 155 ++++++++++++++++++ 9 files changed, 371 insertions(+), 74 deletions(-) create mode 100644 packages/CarSystemUI/res/drawable/car_ic_user_icon.xml create mode 100644 packages/CarSystemUI/src/com/android/systemui/car/statusbar/UserNameViewController.java create mode 100644 packages/CarSystemUI/tests/src/com/android/systemui/car/statusbar/UserNameViewControllerTest.java diff --git a/packages/CarSystemUI/res/drawable/car_ic_user_icon.xml b/packages/CarSystemUI/res/drawable/car_ic_user_icon.xml new file mode 100644 index 0000000000000..1195d05da2286 --- /dev/null +++ b/packages/CarSystemUI/res/drawable/car_ic_user_icon.xml @@ -0,0 +1,25 @@ + + + + + \ No newline at end of file diff --git a/packages/CarSystemUI/res/layout/car_top_navigation_bar.xml b/packages/CarSystemUI/res/layout/car_top_navigation_bar.xml index cdc29eec21cde..af8482a8c6a51 100644 --- a/packages/CarSystemUI/res/layout/car_top_navigation_bar.xml +++ b/packages/CarSystemUI/res/layout/car_top_navigation_bar.xml @@ -31,39 +31,44 @@ android:layoutDirection="ltr"> - - + systemui:icon="@null" + systemui:intent="intent:#Intent;component=com.android.car.settings/.users.UserSwitcherActivity;launchFlags=0x24000000;end" + > + + + + + @@ -94,10 +100,9 @@ android:id="@+id/system_icon_area" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_centerHorizontal="true" + android:layout_alignParentEnd="true" android:layout_centerVertical="true" - android:layout_toEndOf="@+id/clock_container" - android:paddingStart="@*android:dimen/car_padding_1" + android:paddingEnd="@*android:dimen/car_padding_1" android:gravity="center_vertical" android:orientation="horizontal" > @@ -107,46 +112,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="1" - android:paddingStart="4dp" android:gravity="center_vertical" /> - - - - - - - diff --git a/packages/CarSystemUI/res/values/colors.xml b/packages/CarSystemUI/res/values/colors.xml index ab94265935359..98e31b31551ee 100644 --- a/packages/CarSystemUI/res/values/colors.xml +++ b/packages/CarSystemUI/res/values/colors.xml @@ -31,6 +31,8 @@ @*android:color/car_grey_50 #ff172026 + + #ffffff #33000000 @color/status_bar_background_color diff --git a/packages/CarSystemUI/res/values/dimens.xml b/packages/CarSystemUI/res/values/dimens.xml index 8359dac6a30fe..5fb32aff27e82 100644 --- a/packages/CarSystemUI/res/values/dimens.xml +++ b/packages/CarSystemUI/res/values/dimens.xml @@ -46,8 +46,9 @@ in frameworks/base/core package and thus will have no effect if set here. See car_product overlay for car specific defaults--> - 36dp - 36dp + 16dp + 36dp + 36dp 1.75 diff --git a/packages/CarSystemUI/res/values/styles.xml b/packages/CarSystemUI/res/values/styles.xml index e76373d4a4f7b..5b042a4b83ec6 100644 --- a/packages/CarSystemUI/res/values/styles.xml +++ b/packages/CarSystemUI/res/values/styles.xml @@ -25,11 +25,16 @@ 22dp - + +