diff --git a/packages/SystemUI/res/layout/fullscreen_user_pod.xml b/packages/SystemUI/res/layout/car_fullscreen_user_pod.xml similarity index 83% rename from packages/SystemUI/res/layout/fullscreen_user_pod.xml rename to packages/SystemUI/res/layout/car_fullscreen_user_pod.xml index 12f0a80e62c7d..b7e666fbfbf95 100644 --- a/packages/SystemUI/res/layout/fullscreen_user_pod.xml +++ b/packages/SystemUI/res/layout/car_fullscreen_user_pod.xml @@ -26,13 +26,13 @@ + android:layout_width="@dimen/car_fullscreen_user_pod_image_avatar_width" + android:layout_height="@dimen/car_fullscreen_user_pod_image_avatar_height" /> diff --git a/packages/SystemUI/res/layout/car_fullscreen_user_switcher.xml b/packages/SystemUI/res/layout/car_fullscreen_user_switcher.xml new file mode 100644 index 0000000000000..b953ff2c976a9 --- /dev/null +++ b/packages/SystemUI/res/layout/car_fullscreen_user_switcher.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + diff --git a/packages/SystemUI/res/layout/fullscreen_user_switcher.xml b/packages/SystemUI/res/layout/fullscreen_user_switcher.xml deleted file mode 100644 index 46c18963cec15..0000000000000 --- a/packages/SystemUI/res/layout/fullscreen_user_switcher.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - diff --git a/packages/SystemUI/res/layout/keyguard_user_switcher_item.xml b/packages/SystemUI/res/layout/keyguard_user_switcher_item.xml index 2e673761995f5..c6e453a5d991f 100644 --- a/packages/SystemUI/res/layout/keyguard_user_switcher_item.xml +++ b/packages/SystemUI/res/layout/keyguard_user_switcher_item.xml @@ -43,4 +43,4 @@ sysui:frameWidth="@dimen/keyguard_user_switcher_border_thickness" sysui:framePadding="6dp" sysui:activeFrameColor="@color/current_user_border_color" /> - \ No newline at end of file + diff --git a/packages/SystemUI/res/layout/super_status_bar.xml b/packages/SystemUI/res/layout/super_status_bar.xml index 39da8d02a8556..4c80b4843231c 100644 --- a/packages/SystemUI/res/layout/super_status_bar.xml +++ b/packages/SystemUI/res/layout/super_status_bar.xml @@ -80,7 +80,7 @@ diff --git a/packages/SystemUI/res/values/dimens_car.xml b/packages/SystemUI/res/values/dimens_car.xml new file mode 100644 index 0000000000000..ecdccee003eec --- /dev/null +++ b/packages/SystemUI/res/values/dimens_car.xml @@ -0,0 +1,32 @@ + + + + 48sp + 96dp + 96dp + 28sp + 96dp + 96dp + 32dp + 10dp + 10dp + 128dp + 128dp + 128dp + 24sp + diff --git a/packages/SystemUI/res/values/strings_car.xml b/packages/SystemUI/res/values/strings_car.xml new file mode 100644 index 0000000000000..882773a01bffc --- /dev/null +++ b/packages/SystemUI/res/values/strings_car.xml @@ -0,0 +1,29 @@ + + + + Drive safely + + Stay fully aware of driving conditions and always obey applicable laws. Directions may be + inaccurate, incomplete, dangerous, not suitable, prohibited, or involve crossing + administrative areas. Business information may also be inaccurate or incomplete. Data is + not real-time, and location accuracy cannot be guaranteed. Do not handle your mobile device + or use apps not intended for Android Auto while driving. + + + diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/UserGridView.java b/packages/SystemUI/src/com/android/systemui/statusbar/UserGridView.java index 32caf9f0ecf75..2f8bc2d4cb0fc 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/UserGridView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/UserGridView.java @@ -137,7 +137,7 @@ public class UserGridView extends GridView { if (convertView == null) { LayoutInflater inflater = (LayoutInflater)getContext().getSystemService (Context.LAYOUT_INFLATER_SERVICE); - convertView = inflater.inflate(R.layout.fullscreen_user_pod, null); + convertView = inflater.inflate(R.layout.car_fullscreen_user_pod, null); } UserSwitcherController.UserRecord record = getItem(position);