Remove androidx.car_car resources from SysUI
Test: Manual
Change-Id: I7632bad7563d6639a3da9cf2a4e3456244b2d5e4
diff --git a/core/res/res/values/dimens_car.xml b/core/res/res/values/dimens_car.xml
index 5014a29..423cb92 100644
--- a/core/res/res/values/dimens_car.xml
+++ b/core/res/res/values/dimens_car.xml
@@ -21,6 +21,7 @@
<dimen name="car_fullscreen_user_pod_height">356dp</dimen>
<dimen name="car_fullscreen_user_pod_image_avatar_width">96dp</dimen>
<dimen name="car_fullscreen_user_pod_image_avatar_height">96dp</dimen>
+ <dimen name="car_large_avatar_size">96dp</dimen>
<!-- Application Bar -->
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 503bbce..7e7114d 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -3582,6 +3582,7 @@
<java-symbol type="dimen" name="car_fullscreen_user_pod_icon_text_size" />
<java-symbol type="dimen" name="car_fullscreen_user_pod_image_avatar_height" />
<java-symbol type="dimen" name="car_fullscreen_user_pod_image_avatar_width" />
+ <java-symbol type="dimen" name="car_large_avatar_size" />
<java-symbol type="layout" name="car_user_switching_dialog" />
<java-symbol type="id" name="user_loading_avatar" />
<java-symbol type="id" name="user_loading" />
diff --git a/packages/CarSystemUI/res-keyguard/drawable/keyguard_button_background.xml b/packages/CarSystemUI/res-keyguard/drawable/keyguard_button_background.xml
index b428931..8b2779d 100644
--- a/packages/CarSystemUI/res-keyguard/drawable/keyguard_button_background.xml
+++ b/packages/CarSystemUI/res-keyguard/drawable/keyguard_button_background.xml
@@ -18,13 +18,13 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true">
<shape android:shape="rectangle">
- <corners android:radius="@dimen/car_button_radius"/>
+ <corners android:radius="@*android:dimen/car_button_radius"/>
<solid android:color="#131315"/>
</shape>
</item>
<item>
<shape android:shape="rectangle">
- <corners android:radius="@dimen/car_button_radius"/>
+ <corners android:radius="@*android:dimen/car_button_radius"/>
<solid android:color="@color/button_background"/>
</shape>
</item>
diff --git a/packages/CarSystemUI/res-keyguard/layout-land/keyguard_pattern_view.xml b/packages/CarSystemUI/res-keyguard/layout-land/keyguard_pattern_view.xml
index b115a1f..a465254 100644
--- a/packages/CarSystemUI/res-keyguard/layout-land/keyguard_pattern_view.xml
+++ b/packages/CarSystemUI/res-keyguard/layout-land/keyguard_pattern_view.xml
@@ -28,7 +28,7 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingHorizontal="@dimen/car_margin">
+ android:paddingHorizontal="@*android:dimen/car_margin">
<FrameLayout
android:layout_height="match_parent"
@@ -53,10 +53,10 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="@dimen/car_padding_2"
+ android:layout_margin="@*android:dimen/car_padding_2"
android:gravity="center"
android:textColor="@android:color/white"
- android:textSize="@dimen/car_body1_size"
+ android:textSize="@*android:dimen/car_body1_size"
android:text="@string/keyguard_enter_your_pattern" />
<include layout="@layout/keyguard_message_area" />
diff --git a/packages/CarSystemUI/res-keyguard/layout-land/keyguard_pin_view.xml b/packages/CarSystemUI/res-keyguard/layout-land/keyguard_pin_view.xml
index ed88c62..5746102 100644
--- a/packages/CarSystemUI/res-keyguard/layout-land/keyguard_pin_view.xml
+++ b/packages/CarSystemUI/res-keyguard/layout-land/keyguard_pin_view.xml
@@ -29,7 +29,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
- android:paddingHorizontal="@dimen/car_margin">
+ android:paddingHorizontal="@*android:dimen/car_margin">
<FrameLayout
android:layout_width="0dp"
@@ -72,10 +72,10 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_margin="@dimen/car_padding_2"
+ android:layout_margin="@*android:dimen/car_padding_2"
android:gravity="center"
android:textColor="@android:color/white"
- android:textSize="@dimen/car_body1_size"
+ android:textSize="@*android:dimen/car_body1_size"
android:text="@string/keyguard_enter_your_pin" />
<include layout="@layout/keyguard_message_area" />
diff --git a/packages/CarSystemUI/res-keyguard/layout/keyguard_message_area.xml b/packages/CarSystemUI/res-keyguard/layout/keyguard_message_area.xml
index c230414..09cf472 100644
--- a/packages/CarSystemUI/res-keyguard/layout/keyguard_message_area.xml
+++ b/packages/CarSystemUI/res-keyguard/layout/keyguard_message_area.xml
@@ -27,5 +27,5 @@
android:singleLine="true"
android:ellipsize="marquee"
android:focusable="true"
- android:layout_marginBottom="@dimen/car_padding_4"
- android:textSize="@dimen/car_body2_size" />
+ android:layout_marginBottom="@*android:dimen/car_padding_4"
+ android:textSize="@*android:dimen/car_body2_size" />
diff --git a/packages/CarSystemUI/res-keyguard/layout/keyguard_password_view.xml b/packages/CarSystemUI/res-keyguard/layout/keyguard_password_view.xml
index e701fdb..7004fb6 100644
--- a/packages/CarSystemUI/res-keyguard/layout/keyguard_password_view.xml
+++ b/packages/CarSystemUI/res-keyguard/layout/keyguard_password_view.xml
@@ -51,7 +51,7 @@
android:singleLine="true"
android:textStyle="normal"
android:inputType="textPassword"
- android:textSize="@dimen/car_body1_size"
+ android:textSize="@*android:dimen/car_body1_size"
android:textColor="?attr/wallpaperTextColor"
android:textAppearance="?android:attr/textAppearanceMedium"
android:imeOptions="flagForceAscii|actionDone"
@@ -61,10 +61,10 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="@dimen/car_padding_2"
+ android:layout_margin="@*android:dimen/car_padding_2"
android:gravity="center"
android:textColor="@android:color/white"
- android:textSize="@dimen/car_body1_size"
+ android:textSize="@*android:dimen/car_body1_size"
android:text="@string/keyguard_enter_your_password" />
<Button
diff --git a/packages/CarSystemUI/res-keyguard/layout/keyguard_pattern_view.xml b/packages/CarSystemUI/res-keyguard/layout/keyguard_pattern_view.xml
index 00333a8..bb69d44 100644
--- a/packages/CarSystemUI/res-keyguard/layout/keyguard_pattern_view.xml
+++ b/packages/CarSystemUI/res-keyguard/layout/keyguard_pattern_view.xml
@@ -46,10 +46,10 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_margin="@dimen/car_padding_2"
+ android:layout_margin="@*android:dimen/car_padding_2"
android:gravity="center"
android:textColor="@android:color/white"
- android:textSize="@dimen/car_body1_size"
+ android:textSize="@*android:dimen/car_body1_size"
android:text="@string/keyguard_enter_your_pattern" />
<include layout="@layout/keyguard_message_area" />
diff --git a/packages/CarSystemUI/res-keyguard/layout/keyguard_pin_view.xml b/packages/CarSystemUI/res-keyguard/layout/keyguard_pin_view.xml
index 1662251..815e67d 100644
--- a/packages/CarSystemUI/res-keyguard/layout/keyguard_pin_view.xml
+++ b/packages/CarSystemUI/res-keyguard/layout/keyguard_pin_view.xml
@@ -59,10 +59,10 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_margin="@dimen/car_padding_2"
+ android:layout_margin="@*android:dimen/car_padding_2"
android:gravity="center"
android:textColor="@android:color/white"
- android:textSize="@dimen/car_body1_size"
+ android:textSize="@*android:dimen/car_body1_size"
android:text="@string/keyguard_enter_your_pin" />
<include layout="@layout/keyguard_message_area" />
diff --git a/packages/CarSystemUI/res-keyguard/values-land/dimens.xml b/packages/CarSystemUI/res-keyguard/values-land/dimens.xml
index 805a134..c39e0e4 100644
--- a/packages/CarSystemUI/res-keyguard/values-land/dimens.xml
+++ b/packages/CarSystemUI/res-keyguard/values-land/dimens.xml
@@ -15,6 +15,6 @@
limitations under the License.
-->
<resources>
- <dimen name="num_pad_key_margin_horizontal">@dimen/car_padding_5</dimen>
- <dimen name="num_pad_key_margin_bottom">@dimen/car_padding_4</dimen>
+ <dimen name="num_pad_key_margin_horizontal">@*android:dimen/car_padding_5</dimen>
+ <dimen name="num_pad_key_margin_bottom">@*android:dimen/car_padding_4</dimen>
</resources>
diff --git a/packages/CarSystemUI/res-keyguard/values/colors.xml b/packages/CarSystemUI/res-keyguard/values/colors.xml
index e6edbea3..ba9f060 100644
--- a/packages/CarSystemUI/res-keyguard/values/colors.xml
+++ b/packages/CarSystemUI/res-keyguard/values/colors.xml
@@ -16,6 +16,6 @@
-->
<resources>
- <color name="button_background">@color/car_dark_blue_grey_600</color>
- <color name="button_text">@color/car_action1_light</color>
+ <color name="button_background">@*android:color/car_dark_blue_grey_600</color>
+ <color name="button_text">@android:color/white</color>
</resources>
\ No newline at end of file
diff --git a/packages/CarSystemUI/res-keyguard/values/dimens.xml b/packages/CarSystemUI/res-keyguard/values/dimens.xml
index 9424dc3..8dfe171 100644
--- a/packages/CarSystemUI/res-keyguard/values/dimens.xml
+++ b/packages/CarSystemUI/res-keyguard/values/dimens.xml
@@ -19,8 +19,8 @@
<dimen name="num_pad_margin_right">144dp</dimen>
<dimen name="num_pad_key_width">80dp</dimen>
<dimen name="num_pad_key_height">80dp</dimen>
- <dimen name="num_pad_key_margin_horizontal">@dimen/car_padding_6</dimen>
- <dimen name="num_pad_key_margin_bottom">@dimen/car_padding_5</dimen>
+ <dimen name="num_pad_key_margin_horizontal">@*android:dimen/car_padding_5</dimen>
+ <dimen name="num_pad_key_margin_bottom">@*android:dimen/car_padding_5</dimen>
<dimen name="pin_entry_height">@dimen/num_pad_key_height</dimen>
<dimen name="divider_height">1dp</dimen>
<dimen name="key_enter_margin_top">128dp</dimen>
diff --git a/packages/CarSystemUI/res-keyguard/values/styles.xml b/packages/CarSystemUI/res-keyguard/values/styles.xml
index b39e6e6..ecea30a 100644
--- a/packages/CarSystemUI/res-keyguard/values/styles.xml
+++ b/packages/CarSystemUI/res-keyguard/values/styles.xml
@@ -40,7 +40,7 @@
<item name="android:layout_marginEnd">@dimen/num_pad_key_margin_horizontal</item>
</style>
- <style name="KeyguardButton" parent="Widget.Car.Button">
+ <style name="KeyguardButton" parent="@android:style/Widget.DeviceDefault.Button">
<item name="android:background">@drawable/keyguard_button_background</item>
<item name="android:textColor">@color/button_text</item>
<item name="android:textAllCaps">false</item>
@@ -48,6 +48,6 @@
<style name="Widget.TextView.NumPadKey" parent="@android:style/Widget.TextView">
<!-- Only replaces the text size. -->
- <item name="android:textSize">@dimen/car_body1_size</item>
+ <item name="android:textSize">@*android:dimen/car_body1_size</item>
</style>
</resources>
diff --git a/packages/CarSystemUI/res/drawable/car_ic_add_white.xml b/packages/CarSystemUI/res/drawable/car_ic_add_white.xml
index d681860..9d5ca26 100644
--- a/packages/CarSystemUI/res/drawable/car_ic_add_white.xml
+++ b/packages/CarSystemUI/res/drawable/car_ic_add_white.xml
@@ -13,8 +13,8 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/car_touch_target_size"
- android:height="@dimen/car_touch_target_size"
+ android:width="@*android:dimen/car_touch_target_size"
+ android:height="@*android:dimen/car_touch_target_size"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
diff --git a/packages/CarSystemUI/res/drawable/car_rounded_bg_bottom.xml b/packages/CarSystemUI/res/drawable/car_rounded_bg_bottom.xml
index eb501e5..07227fb 100644
--- a/packages/CarSystemUI/res/drawable/car_rounded_bg_bottom.xml
+++ b/packages/CarSystemUI/res/drawable/car_rounded_bg_bottom.xml
@@ -19,9 +19,9 @@
android:shape="rectangle">
<solid android:color="?android:attr/colorBackgroundFloating" />
<corners
- android:bottomLeftRadius="@dimen/car_radius_3"
+ android:bottomLeftRadius="@*android:dimen/car_radius_3"
android:topLeftRadius="0dp"
- android:bottomRightRadius="@dimen/car_radius_3"
+ android:bottomRightRadius="@*android:dimen/car_radius_3"
android:topRightRadius="0dp"
/>
</shape>
diff --git a/packages/CarSystemUI/res/drawable/car_seekbar_thumb.xml b/packages/CarSystemUI/res/drawable/car_seekbar_thumb.xml
index 1a9b8a5..2649a00 100644
--- a/packages/CarSystemUI/res/drawable/car_seekbar_thumb.xml
+++ b/packages/CarSystemUI/res/drawable/car_seekbar_thumb.xml
@@ -19,19 +19,19 @@
<item>
<shape android:shape="oval">
<padding
- android:bottom="@dimen/car_padding_1"
- android:left="@dimen/car_padding_1"
- android:right="@dimen/car_padding_1"
- android:top="@dimen/car_padding_1"/>
+ android:bottom="@*android:dimen/car_padding_1"
+ android:left="@*android:dimen/car_padding_1"
+ android:right="@*android:dimen/car_padding_1"
+ android:top="@*android:dimen/car_padding_1"/>
<solid android:color="@android:color/black"/>
</shape>
</item>
<item>
<shape android:shape="oval">
- <solid android:color="@color/car_accent"/>
+ <solid android:color="@*android:color/car_accent"/>
<size
- android:width="@dimen/car_seekbar_thumb_size"
- android:height="@dimen/car_seekbar_thumb_size"/>
+ android:width="@*android:dimen/car_seekbar_thumb_size"
+ android:height="@*android:dimen/car_seekbar_thumb_size"/>
</shape>
</item>
</layer-list>
diff --git a/packages/CarSystemUI/res/layout/car_navigation_bar.xml b/packages/CarSystemUI/res/layout/car_navigation_bar.xml
index 93d2b67..34fd703 100644
--- a/packages/CarSystemUI/res/layout/car_navigation_bar.xml
+++ b/packages/CarSystemUI/res/layout/car_navigation_bar.xml
@@ -137,8 +137,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:paddingStart="@dimen/car_keyline_1"
- android:paddingEnd="@dimen/car_keyline_1"
+ android:paddingStart="@*android:dimen/car_keyline_1"
+ android:paddingEnd="@*android:dimen/car_keyline_1"
android:gravity="center"
android:visibility="gone">
</LinearLayout>
diff --git a/packages/CarSystemUI/res/layout/car_navigation_bar_unprovisioned.xml b/packages/CarSystemUI/res/layout/car_navigation_bar_unprovisioned.xml
index 4fa877f..28eba6c 100644
--- a/packages/CarSystemUI/res/layout/car_navigation_bar_unprovisioned.xml
+++ b/packages/CarSystemUI/res/layout/car_navigation_bar_unprovisioned.xml
@@ -28,12 +28,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:paddingStart="@dimen/car_padding_5"
- android:paddingEnd="@dimen/car_padding_5">
+ android:paddingStart="@*android:dimen/car_padding_5"
+ android:paddingEnd="@*android:dimen/car_padding_5">
<com.android.systemui.statusbar.car.CarNavigationButton
android:id="@+id/home"
- android:layout_width="@dimen/car_touch_target_size"
+ android:layout_width="@*android:dimen/car_touch_target_size"
android:layout_height="match_parent"
android:background="?android:attr/selectableItemBackground"
android:src="@drawable/car_ic_overview"
diff --git a/packages/CarSystemUI/res/layout/car_top_navigation_bar.xml b/packages/CarSystemUI/res/layout/car_top_navigation_bar.xml
index 2fe740d..925ccb4 100644
--- a/packages/CarSystemUI/res/layout/car_top_navigation_bar.xml
+++ b/packages/CarSystemUI/res/layout/car_top_navigation_bar.xml
@@ -49,11 +49,11 @@
android:id="@+id/lefttext"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:paddingStart="@dimen/car_padding_4"
+ android:paddingStart="@*android:dimen/car_padding_4"
android:paddingEnd="16dp"
android:gravity="center_vertical|start"
android:minEms="4"
- android:textAppearance="@style/TextAppearance.Car.Status"
+ android:textAppearance="@style/TextAppearance.CarStatus"
systemui:hvacAreaId="49"
systemui:hvacMaxText="@string/hvac_max_text"
systemui:hvacMaxValue="@dimen/hvac_max_value"
@@ -96,7 +96,7 @@
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_toEndOf="@+id/clock_container"
- android:paddingStart="@dimen/car_padding_1"
+ android:paddingStart="@*android:dimen/car_padding_1"
android:gravity="center_vertical"
android:orientation="horizontal"
>
@@ -132,10 +132,10 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:paddingStart="16dp"
- android:paddingEnd="@dimen/car_padding_4"
+ android:paddingEnd="@*android:dimen/car_padding_4"
android:gravity="center_vertical|end"
android:minEms="4"
- android:textAppearance="@style/TextAppearance.Car.Status"
+ android:textAppearance="@style/TextAppearance.CarStatus"
systemui:hvacAreaId="68"
systemui:hvacMaxText="@string/hvac_max_text"
systemui:hvacMaxValue="@dimen/hvac_max_value"
diff --git a/packages/CarSystemUI/res/values/colors_car.xml b/packages/CarSystemUI/res/values/colors_car.xml
index 08e16cd..69ab3f3 100644
--- a/packages/CarSystemUI/res/values/colors_car.xml
+++ b/packages/CarSystemUI/res/values/colors_car.xml
@@ -18,12 +18,12 @@
-->
<resources>
<color name="car_qs_background_primary">#263238</color> <!-- Blue Gray 900 -->
- <color name="car_qs_footer_user_name_color">@color/car_grey_50</color>
+ <color name="car_qs_footer_user_name_color">@*android:color/car_grey_50</color>
<!-- colors for user switcher -->
- <color name="car_user_switcher_background_color">@color/car_card_dark</color>
- <color name="car_user_switcher_name_text_color">@color/car_body1_light</color>
- <color name="car_user_switcher_add_user_background_color">@color/car_dark_blue_grey_600</color>
- <color name="car_user_switcher_add_user_add_sign_color">@color/car_body1_light</color>
+ <color name="car_user_switcher_background_color">@*android:color/car_card_dark</color>
+ <color name="car_user_switcher_name_text_color">@*android:color/car_body1_light</color>
+ <color name="car_user_switcher_add_user_background_color">@*android:color/car_dark_blue_grey_600</color>
+ <color name="car_user_switcher_add_user_add_sign_color">@*android:color/car_body1_light</color>
</resources>
diff --git a/packages/CarSystemUI/res/values/dimens.xml b/packages/CarSystemUI/res/values/dimens.xml
index 07ecca2..25addf1 100644
--- a/packages/CarSystemUI/res/values/dimens.xml
+++ b/packages/CarSystemUI/res/values/dimens.xml
@@ -49,7 +49,7 @@
<dimen name="volume_dialog_elevation">6dp</dimen>
- <dimen name="volume_dialog_row_margin_end">@dimen/car_keyline_3</dimen>
+ <dimen name="volume_dialog_row_margin_end">@*android:dimen/car_keyline_3</dimen>
<dimen name="volume_dialog_row_padding_end">0dp</dimen>
diff --git a/packages/CarSystemUI/res/values/dimens_car.xml b/packages/CarSystemUI/res/values/dimens_car.xml
index c027f81..42a7649 100644
--- a/packages/CarSystemUI/res/values/dimens_car.xml
+++ b/packages/CarSystemUI/res/values/dimens_car.xml
@@ -17,11 +17,11 @@
-->
<resources>
<!-- dimensions for the car user switcher -->
- <dimen name="car_user_switcher_name_text_size">@dimen/car_body1_size</dimen>
- <dimen name="car_user_switcher_image_avatar_size">@dimen/car_large_avatar_size</dimen>
- <dimen name="car_user_switcher_vertical_spacing_between_users">@dimen/car_padding_5</dimen>
- <dimen name="car_user_switcher_vertical_spacing_between_name_and_avatar">@dimen/car_padding_4</dimen>
- <dimen name="car_user_switcher_margin_top">@dimen/car_padding_4</dimen>
+ <dimen name="car_user_switcher_name_text_size">@*android:dimen/car_body1_size</dimen>
+ <dimen name="car_user_switcher_image_avatar_size">@*android:dimen/car_large_avatar_size</dimen>
+ <dimen name="car_user_switcher_vertical_spacing_between_users">@*android:dimen/car_padding_5</dimen>
+ <dimen name="car_user_switcher_vertical_spacing_between_name_and_avatar">@*android:dimen/car_padding_4</dimen>
+ <dimen name="car_user_switcher_margin_top">@*android:dimen/car_padding_4</dimen>
<dimen name="car_navigation_button_width">64dp</dimen>
<dimen name="car_navigation_bar_width">760dp</dimen>
@@ -37,7 +37,7 @@
<dimen name="car_qs_footer_icon_height">56dp</dimen>
<dimen name="car_qs_footer_user_switch_icon_margin">5dp</dimen>
<dimen name="car_qs_footer_user_switch_icon_width">36dp</dimen>
- <dimen name="car_qs_footer_user_name_text_size">@dimen/car_body2_size</dimen>
+ <dimen name="car_qs_footer_user_name_text_size">@*android:dimen/car_body2_size</dimen>
<dimen name="car_user_switcher_container_height">420dp</dimen>
<!-- This must be the negative of car_user_switcher_container_height for the animation. -->
diff --git a/packages/CarSystemUI/res/values/styles.xml b/packages/CarSystemUI/res/values/styles.xml
index 0d95d30..6c22f69 100644
--- a/packages/CarSystemUI/res/values/styles.xml
+++ b/packages/CarSystemUI/res/values/styles.xml
@@ -29,12 +29,12 @@
parent="@*android:style/TextAppearance.StatusBar.Icon">
<item name="android:textSize">42sp</item>
<item name="android:fontFamily">sans-serif-regular</item>
- <item name="android:textColor">@color/car_grey_50</item>
+ <item name="android:textColor">@*android:color/car_grey_50</item>
</style>
- <style name="TextAppearance.Car.Status">
- <item name="android:textSize">@dimen/car_body2_size</item>
- <item name="android:textColor">@color/car_grey_50</item>
+ <style name="TextAppearance.CarStatus" parent="@android:style/TextAppearance.DeviceDefault">
+ <item name="android:textSize">@*android:dimen/car_body2_size</item>
+ <item name="android:textColor">@*android:color/car_grey_50</item>
</style>
<style name="CarNavigationBarButtonTheme">
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java
index fb2b57b..79f96f5 100644
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java
+++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/UserGridRecyclerView.java
@@ -253,7 +253,8 @@
}
private void showMaxUserLimitReachedDialog() {
- AlertDialog maxUsersDialog = new Builder(mContext, R.style.Theme_Car_Dark_Dialog_Alert)
+ AlertDialog maxUsersDialog = new Builder(mContext,
+ com.android.internal.R.style.Theme_DeviceDefault_Dialog_Alert)
.setTitle(R.string.user_limit_reached_title)
.setMessage(getResources().getQuantityString(
R.plurals.user_limit_reached_message,
@@ -272,7 +273,8 @@
.concat(System.getProperty("line.separator"))
.concat(mRes.getString(R.string.user_add_user_message_update));
- AlertDialog addUserDialog = new Builder(mContext, R.style.Theme_Car_Dark_Dialog_Alert)
+ AlertDialog addUserDialog = new Builder(mContext,
+ com.android.internal.R.style.Theme_DeviceDefault_Dialog_Alert)
.setTitle(R.string.user_add_user_title)
.setMessage(message)
.setNegativeButton(android.R.string.cancel, this)