Rename styles and widgets from Chassis to CarUI
Bug: 140950423
Test: build and deploy test app
Change-Id: I997e68a89af37c0e8b67a5289233529e049b0346
diff --git a/car-chassis-lib/README.md b/car-chassis-lib/README.md
index 3d1015a..fed3893 100644
--- a/car-chassis-lib/README.md
+++ b/car-chassis-lib/README.md
@@ -2,7 +2,7 @@
Components and resources designed to increase Automotive UI consistency between
GAS (Google Automotive Services) apps, system-apps and OEM developed apps.
-See: go/aae-chassis
+See: go/aae-carui
## Content
diff --git a/car-chassis-lib/res/layout-port/car_ui_toolbar.xml b/car-chassis-lib/res/layout-port/car_ui_toolbar.xml
index eb35eac..a0f0f5c 100644
--- a/car-chassis-lib/res/layout-port/car_ui_toolbar.xml
+++ b/car-chassis-lib/res/layout-port/car_ui_toolbar.xml
@@ -63,7 +63,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/car_ui_toolbar_title_margin_start"
- style="@style/TextAppearance.Chassis.Widget.Toolbar.Title"
+ style="@style/TextAppearance.CarUi.Widget.Toolbar.Title"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/row_separator"
app:layout_constraintStart_toEndOf="@id/nav_icon_container"
diff --git a/car-chassis-lib/res/layout/car_ui_preference.xml b/car-chassis-lib/res/layout/car_ui_preference.xml
index 7c0807e..2c2f4cf 100644
--- a/car-chassis-lib/res/layout/car_ui_preference.xml
+++ b/car-chassis-lib/res/layout/car_ui_preference.xml
@@ -52,13 +52,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textAppearance="@style/TextAppearance.Chassis.PreferenceTitle"/>
+ android:textAppearance="@style/TextAppearance.CarUi.PreferenceTitle"/>
<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="@style/TextAppearance.Chassis.PreferenceSummary"/>
+ android:textAppearance="@style/TextAppearance.CarUi.PreferenceSummary"/>
</LinearLayout>
diff --git a/car-chassis-lib/res/layout/car_ui_preference_category.xml b/car-chassis-lib/res/layout/car_ui_preference_category.xml
index f5477f7..a9f3938 100644
--- a/car-chassis-lib/res/layout/car_ui_preference_category.xml
+++ b/car-chassis-lib/res/layout/car_ui_preference_category.xml
@@ -50,14 +50,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAlignment="viewStart"
- android:textAppearance="@style/TextAppearance.Chassis.PreferenceCategoryTitle"/>
+ android:textAppearance="@style/TextAppearance.CarUi.PreferenceCategoryTitle"/>
<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textAppearance="@style/TextAppearance.Chassis.PreferenceSummary"/>
+ android:textAppearance="@style/TextAppearance.CarUi.PreferenceSummary"/>
</LinearLayout>
diff --git a/car-chassis-lib/res/layout/car_ui_preference_dialog_edittext.xml b/car-chassis-lib/res/layout/car_ui_preference_dialog_edittext.xml
index b9574aa..04c1c37 100644
--- a/car-chassis-lib/res/layout/car_ui_preference_dialog_edittext.xml
+++ b/car-chassis-lib/res/layout/car_ui_preference_dialog_edittext.xml
@@ -25,7 +25,7 @@
<TextView
android:id="@android:id/message"
- style="@style/TextAppearance.Chassis.PreferenceEditTextDialogMessage"
+ style="@style/TextAppearance.CarUi.PreferenceEditTextDialogMessage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/car_ui_preference_edit_text_dialog_message_margin_bottom"
diff --git a/car-chassis-lib/res/layout/car_ui_preference_fragment.xml b/car-chassis-lib/res/layout/car_ui_preference_fragment.xml
index 83d8785..b70bfa5 100644
--- a/car-chassis-lib/res/layout/car_ui_preference_fragment.xml
+++ b/car-chassis-lib/res/layout/car_ui_preference_fragment.xml
@@ -24,7 +24,7 @@
android:id="@android:id/list_container"
android:layout_width="match_parent"
android:layout_height="match_parent">
- <com.android.car.chassis.pagedrecyclerview.PagedRecyclerView
+ <com.android.car.ui.pagedrecyclerview.PagedRecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
diff --git a/car-chassis-lib/res/layout/car_ui_preference_widget_seekbar.xml b/car-chassis-lib/res/layout/car_ui_preference_widget_seekbar.xml
index e059920..9442e7e 100644
--- a/car-chassis-lib/res/layout/car_ui_preference_widget_seekbar.xml
+++ b/car-chassis-lib/res/layout/car_ui_preference_widget_seekbar.xml
@@ -47,7 +47,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:textAppearance="@style/TextAppearance.Chassis.PreferenceTitle"/>
+ android:textAppearance="@style/TextAppearance.CarUi.PreferenceTitle"/>
<TextView
android:id="@android:id/summary"
@@ -55,7 +55,7 @@
android:layout_height="wrap_content"
android:layout_alignStart="@android:id/title"
android:layout_below="@android:id/title"
- android:textAppearance="@style/TextAppearance.Chassis.PreferenceSummary"/>
+ android:textAppearance="@style/TextAppearance.CarUi.PreferenceSummary"/>
<!-- Using UnPressableLinearLayout as a workaround to disable the pressed state propagation
to the children of this container layout. Otherwise, the animated pressed state will also
diff --git a/car-chassis-lib/res/layout/car_ui_tab_item.xml b/car-chassis-lib/res/layout/car_ui_tab_item.xml
index 653b8a1..62f4ac7 100644
--- a/car-chassis-lib/res/layout/car_ui_tab_item.xml
+++ b/car-chassis-lib/res/layout/car_ui_tab_item.xml
@@ -29,5 +29,5 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:gravity="center"
- android:textAppearance="@style/TextAppearance.Chassis.Widget.Toolbar.Tab"/>
+ android:textAppearance="@style/TextAppearance.CarUi.Widget.Toolbar.Tab"/>
</merge>
diff --git a/car-chassis-lib/res/layout/car_ui_toolbar.xml b/car-chassis-lib/res/layout/car_ui_toolbar.xml
index 5e34143..4d1a8a6 100644
--- a/car-chassis-lib/res/layout/car_ui_toolbar.xml
+++ b/car-chassis-lib/res/layout/car_ui_toolbar.xml
@@ -34,7 +34,7 @@
android:layout_height="@dimen/car_ui_toolbar_icon_size"
android:layout_gravity="center"
android:scaleType="fitXY"
- style="@style/Widget.Chassis.Toolbar.NavIcon"/>
+ style="@style/Widget.CarUi.Toolbar.NavIcon"/>
<ImageView
android:id="@+id/logo"
android:layout_width="@dimen/car_ui_toolbar_icon_size"
@@ -48,7 +48,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/car_ui_toolbar_title_margin_start"
- style="@style/TextAppearance.Chassis.Widget.Toolbar.Title"
+ style="@style/TextAppearance.CarUi.Widget.Toolbar.Title"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/bottom_styleable"
app:layout_constraintStart_toEndOf="@+id/nav_icon_container"
diff --git a/car-chassis-lib/res/layout/car_ui_toolbar_menu_item_text.xml b/car-chassis-lib/res/layout/car_ui_toolbar_menu_item_text.xml
index a44a308..bfe93ec 100644
--- a/car-chassis-lib/res/layout/car_ui_toolbar_menu_item_text.xml
+++ b/car-chassis-lib/res/layout/car_ui_toolbar_menu_item_text.xml
@@ -17,7 +17,7 @@
<Button
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/car_ui_toolbar_menu_item_text"
- style="@style/Widget.Chassis.Toolbar.TextButton"
+ style="@style/Widget.CarUi.Toolbar.TextButton"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/car_ui_toolbar_menu_item_margin"
diff --git a/car-chassis-lib/res/values/attrs.xml b/car-chassis-lib/res/values/attrs.xml
index 6867254..6dc11a8 100644
--- a/car-chassis-lib/res/values/attrs.xml
+++ b/car-chassis-lib/res/values/attrs.xml
@@ -14,7 +14,7 @@
limitations under the License.
-->
<resources>
- <declare-styleable name="ChassisToolbar">
+ <declare-styleable name="CarUiToolbar">
<!-- Title of the toolbar, only displayed in certain conditions -->
<attr name="title" format="string"/>
<!-- Logo drawable for the toolbar. Appears when there's no back/close button shown -->
@@ -34,8 +34,8 @@
<attr name="showBackground" format="boolean"/>
</declare-styleable>
- <!-- Theme attribute to specifying a default style for all chassisToolbars -->
- <attr name="chassisToolbarStyle" format="reference"/>
+ <!-- Theme attribute to specifying a default style for all CarUiToolbars -->
+ <attr name="CarUiToolbarStyle" format="reference"/>
<declare-styleable name="PagedRecyclerView">
<!-- Whether to enable the car_ui_pagedrecyclerview_divider for linear layout or not. -->
diff --git a/car-chassis-lib/res/values/styles.xml b/car-chassis-lib/res/values/styles.xml
index 2974efb..6e9a643 100644
--- a/car-chassis-lib/res/values/styles.xml
+++ b/car-chassis-lib/res/values/styles.xml
@@ -15,35 +15,35 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
- <!-- Styles for chassis tab view -->
+ <!-- Styles for CarUi tab view -->
- <style name="Widget.Chassis" parent="android:Widget.DeviceDefault"/>
+ <style name="Widget.CarUi" parent="android:Widget.DeviceDefault"/>
- <style name="Widget.Chassis.Toolbar"/>
+ <style name="Widget.CarUi.Toolbar"/>
- <style name="Widget.Chassis.Toolbar.NavIcon">
+ <style name="Widget.CarUi.Toolbar.NavIcon">
<item name="android:tint">@color/car_ui_primary_text_color</item>
<item name="android:src">@drawable/car_ui_icon_arrow_back</item>
</style>
- <style name="Widget.Chassis.Toolbar.TextButton">
+ <style name="Widget.CarUi.Toolbar.TextButton">
<item name="android:background">?android:attr/selectableItemBackground</item>
<item name="android:textColor">?android:attr/colorAccent</item>
- <item name="android:textAppearance">@style/TextAppearance.Chassis.Widget.Toolbar.Tab</item>
+ <item name="android:textAppearance">@style/TextAppearance.CarUi.Widget.Toolbar.Tab</item>
</style>
- <style name="Widget.Chassis.PagedRecyclerView"/>
- <style name="Widget.Chassis.PagedRecyclerView.NestedRecyclerView"/>
+ <style name="Widget.CarUi.PagedRecyclerView"/>
+ <style name="Widget.CarUi.PagedRecyclerView.NestedRecyclerView"/>
<!-- Preference Styles -->
- <style name="Preference.Chassis">
+ <style name="Preference.CarUi">
<item name="android:layout">@layout/car_ui_preference</item>
<item name="allowDividerAbove">@bool/car_ui_preference_allow_divider_above</item>
<item name="allowDividerBelow">@bool/car_ui_preference_allow_divider_below</item>
</style>
- <style name="Preference.Chassis.Category">
+ <style name="Preference.CarUi.Category">
<item name="android:layout">@layout/car_ui_preference_category</item>
<!-- The title should not dim if the category is disabled, instead only the preference children should dim. -->
<item name="android:shouldDisableView">false</item>
@@ -52,48 +52,48 @@
<item name="allowDividerBelow">@bool/car_ui_preference_category_allow_divider_below</item>
</style>
- <style name="Preference.Chassis.CheckBoxPreference">
+ <style name="Preference.CarUi.CheckBoxPreference">
<item name="android:widgetLayout">@layout/car_ui_preference_widget_checkbox</item>
</style>
- <style name="Preference.Chassis.DialogPreference">
+ <style name="Preference.CarUi.DialogPreference">
<item name="android:positiveButtonText">@string/car_ui_dialog_preference_positive</item>
<item name="android:negativeButtonText">@string/car_ui_dialog_preference_negative</item>
</style>
- <style name="Preference.Chassis.DialogPreference.EditTextPreference">
+ <style name="Preference.CarUi.DialogPreference.EditTextPreference">
<item name="android:dialogLayout">@layout/car_ui_preference_dialog_edittext</item>
</style>
- <style name="Preference.Chassis.DropDown">
+ <style name="Preference.CarUi.DropDown">
<item name="android:layout">@layout/car_ui_preference_dropdown</item>
</style>
- <style name="Preference.Chassis.Information">
+ <style name="Preference.CarUi.Information">
<item name="android:enabled">false</item>
<item name="android:shouldDisableView">false</item>
</style>
- <style name="Preference.Chassis.PreferenceScreen"/>
+ <style name="Preference.CarUi.PreferenceScreen"/>
- <style name="Preference.Chassis.SeekBarPreference">
+ <style name="Preference.CarUi.SeekBarPreference">
<item name="android:layout">@layout/car_ui_preference_widget_seekbar</item>
<item name="adjustable">true</item>
<item name="showSeekBarValue">false</item>
</style>
- <style name="Preference.Chassis.SwitchPreference">
+ <style name="Preference.CarUi.SwitchPreference">
<item name="android:widgetLayout">@layout/car_ui_preference_widget_switch</item>
<item name="android:switchTextOn">@string/car_ui_switch_preference_on</item>
<item name="android:switchTextOff">@string/car_ui_switch_preference_off</item>
</style>
- <style name="PreferenceFragment.Chassis">
+ <style name="PreferenceFragment.CarUi">
<item name="android:divider">?android:attr/listDivider</item>
<item name="android:layout">@layout/car_ui_preference_fragment</item>
</style>
- <style name="PreferenceFragmentList.Chassis">
+ <style name="PreferenceFragmentList.CarUi">
<item name="android:paddingTop">0dp</item>
<item name="android:paddingBottom">0dp</item>
<item name="android:paddingLeft">0dp</item>
@@ -104,42 +104,42 @@
<!-- TextAppearance -->
- <style name="TextAppearance.Chassis" parent="android:TextAppearance.DeviceDefault">
+ <style name="TextAppearance.CarUi" parent="android:TextAppearance.DeviceDefault">
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
- <style name="TextAppearance.Chassis.PreferenceCategoryTitle">
+ <style name="TextAppearance.CarUi.PreferenceCategoryTitle">
<item name="android:fontFamily">@string/car_ui_preference_category_title_font_family</item>
<item name="android:textColor">@color/car_ui_preference_category_title_text_color</item>
<item name="android:textSize">@dimen/car_ui_preference_category_text_size</item>
</style>
- <style name="TextAppearance.Chassis.PreferenceSummary">
+ <style name="TextAppearance.CarUi.PreferenceSummary">
<item name="android:textColor">@color/car_ui_preference_summary_text_color</item>
<item name="android:textSize">@dimen/car_ui_preference_summary_text_size</item>
</style>
- <style name="TextAppearance.Chassis.PreferenceTitle">
+ <style name="TextAppearance.CarUi.PreferenceTitle">
<item name="android:textColor">@color/car_ui_preference_title_text_color</item>
<item name="android:textSize">@dimen/car_ui_preference_title_text_size</item>
</style>
- <style name="TextAppearance.Chassis.PreferenceEditTextDialogMessage">
+ <style name="TextAppearance.CarUi.PreferenceEditTextDialogMessage">
<item name="android:textColor">@color/car_ui_preference_edit_text_dialog_message_text_color</item>
<item name="android:textSize">@dimen/car_ui_preference_edit_text_dialog_message_text_size</item>
</style>
- <style name="TextAppearance.Chassis.Widget"/>
+ <style name="TextAppearance.CarUi.Widget"/>
- <style name="TextAppearance.Chassis.Widget.Toolbar"/>
+ <style name="TextAppearance.CarUi.Widget.Toolbar"/>
- <style name="TextAppearance.Chassis.Widget.Toolbar.Title">
+ <style name="TextAppearance.CarUi.Widget.Toolbar.Title">
<item name="android:singleLine">true</item>
<item name="android:textSize">32sp</item>
<item name="android:letterSpacing">@dimen/car_ui_letter_spacing_body1</item>
</style>
- <style name="TextAppearance.Chassis.Widget.Toolbar.Tab">
+ <style name="TextAppearance.CarUi.Widget.Toolbar.Tab">
<item name="android:textSize">24sp</item>
<item name="android:letterSpacing">@dimen/car_ui_letter_spacing_body3</item>
</style>
diff --git a/car-chassis-lib/res/values/themes.xml b/car-chassis-lib/res/values/themes.xml
index 4c41a38..0eadfb7 100644
--- a/car-chassis-lib/res/values/themes.xml
+++ b/car-chassis-lib/res/values/themes.xml
@@ -15,14 +15,14 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Base application theme. -->
- <style name="ChassisTheme" parent="android:Theme.DeviceDefault">
+ <style name="CarUiTheme" parent="android:Theme.DeviceDefault">
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
</style>
- <!-- TODO: merge with ChassisTheme and extend DeviceDefault.NoActionBar once toolbar is ready -->
+ <!-- TODO: merge with CarUiTheme and extend DeviceDefault.NoActionBar once toolbar is ready -->
<!-- TODO: for internal TODOs, expand theme/style to leaf resources as necessary -->
- <style name="Theme.Chassis" parent="@android:style/Theme.DeviceDefault">
+ <style name="Theme.CarUi" parent="@android:style/Theme.DeviceDefault">
<!-- Attributes from: Base.V7.Theme.AppCompat -->
@@ -204,25 +204,25 @@
<item name="listChoiceIndicatorSingleAnimated">?android:attr/listChoiceIndicatorSingle</item>
<item name="listChoiceIndicatorMultipleAnimated">?android:attr/listChoiceIndicatorMultiple</item>
- <item name="preferenceTheme">@style/ChassisPreferenceTheme</item>
+ <item name="preferenceTheme">@style/CarUiPreferenceTheme</item>
</style>
- <style name="ChassisPreferenceTheme">
- <item name="checkBoxPreferenceStyle">@style/Preference.Chassis.CheckBoxPreference
+ <style name="CarUiPreferenceTheme">
+ <item name="checkBoxPreferenceStyle">@style/Preference.CarUi.CheckBoxPreference
</item>
- <item name="dialogPreferenceStyle">@style/Preference.Chassis.DialogPreference</item>
- <item name="dropdownPreferenceStyle">@style/Preference.Chassis.DropDown</item>
+ <item name="dialogPreferenceStyle">@style/Preference.CarUi.DialogPreference</item>
+ <item name="dropdownPreferenceStyle">@style/Preference.CarUi.DropDown</item>
<item name="editTextPreferenceStyle">
- @style/Preference.Chassis.DialogPreference.EditTextPreference
+ @style/Preference.CarUi.DialogPreference.EditTextPreference
</item>
- <item name="preferenceCategoryStyle">@style/Preference.Chassis.Category</item>
- <item name="preferenceFragmentCompatStyle">@style/PreferenceFragment.Chassis</item>
- <item name="preferenceFragmentListStyle">@style/PreferenceFragmentList.Chassis</item>
- <item name="preferenceFragmentStyle">@style/PreferenceFragment.Chassis</item>
- <item name="preferenceScreenStyle">@style/Preference.Chassis.PreferenceScreen</item>
- <item name="preferenceStyle">@style/Preference.Chassis</item>
- <item name="seekBarPreferenceStyle">@style/Preference.Chassis.SeekBarPreference</item>
- <item name="switchPreferenceStyle">@style/Preference.Chassis.SwitchPreference</item>
+ <item name="preferenceCategoryStyle">@style/Preference.CarUi.Category</item>
+ <item name="preferenceFragmentCompatStyle">@style/PreferenceFragment.CarUi</item>
+ <item name="preferenceFragmentListStyle">@style/PreferenceFragmentList.CarUi</item>
+ <item name="preferenceFragmentStyle">@style/PreferenceFragment.CarUi</item>
+ <item name="preferenceScreenStyle">@style/Preference.CarUi.PreferenceScreen</item>
+ <item name="preferenceStyle">@style/Preference.CarUi</item>
+ <item name="seekBarPreferenceStyle">@style/Preference.CarUi.SeekBarPreference</item>
+ <item name="switchPreferenceStyle">@style/Preference.CarUi.SwitchPreference</item>
</style>
</resources>
diff --git a/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java
index a6eded0..99a3abe 100644
--- a/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java
+++ b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java
@@ -265,7 +265,7 @@
TypedArray a =
context.obtainStyledAttributes(
attrs, R.styleable.PagedRecyclerView, defStyleAttr,
- R.style.Widget_Chassis_PagedRecyclerView);
+ R.style.Widget_CarUi_PagedRecyclerView);
mScrollBarEnabled = context.getResources().getBoolean(R.bool.car_ui_scrollbar_enable);
mFullyInitialized = false;
@@ -278,7 +278,7 @@
mNestedRecyclerView =
new RecyclerView(context, attrs,
- R.style.Widget_Chassis_PagedRecyclerView_NestedRecyclerView);
+ R.style.Widget_CarUi_PagedRecyclerView_NestedRecyclerView);
mScrollBarPaddingStart =
context.getResources().getDimension(R.dimen.car_ui_scrollbar_padding_start);
diff --git a/car-chassis-lib/src/com/android/car/ui/toolbar/Toolbar.java b/car-chassis-lib/src/com/android/car/ui/toolbar/Toolbar.java
index 3ea4792..c2161f5 100644
--- a/car-chassis-lib/src/com/android/car/ui/toolbar/Toolbar.java
+++ b/car-chassis-lib/src/com/android/car/ui/toolbar/Toolbar.java
@@ -52,7 +52,7 @@
*/
public class Toolbar extends FrameLayout {
- private static final String TAG = "ChassisToolbar";
+ private static final String TAG = "CarUiToolbar";
/** Enum of states the toolbar can be in. Controls what elements of the toolbar are displayed */
public enum State {
@@ -114,7 +114,7 @@
}
public Toolbar(Context context, AttributeSet attrs) {
- this(context, attrs, R.attr.chassisToolbarStyle);
+ this(context, attrs, R.attr.CarUiToolbarStyle);
}
public Toolbar(Context context, AttributeSet attrs, int defStyleAttr) {
@@ -139,20 +139,20 @@
mOverflowButton = requireViewById(R.id.car_ui_toolbar_overflow_button);
TypedArray a = context.obtainStyledAttributes(
- attrs, R.styleable.ChassisToolbar, defStyleAttr, defStyleRes);
+ attrs, R.styleable.CarUiToolbar, defStyleAttr, defStyleRes);
try {
- mTitle.setText(a.getString(R.styleable.ChassisToolbar_title));
- setLogo(a.getResourceId(R.styleable.ChassisToolbar_logo, 0));
- setBackgroundShown(a.getBoolean(R.styleable.ChassisToolbar_showBackground, true));
+ mTitle.setText(a.getString(R.styleable.CarUiToolbar_title));
+ setLogo(a.getResourceId(R.styleable.CarUiToolbar_logo, 0));
+ setBackgroundShown(a.getBoolean(R.styleable.CarUiToolbar_showBackground, true));
mShowMenuItemsWhileSearching = a.getBoolean(
- R.styleable.ChassisToolbar_showMenuItemsWhileSearching, false);
- String searchHint = a.getString(R.styleable.ChassisToolbar_searchHint);
+ R.styleable.CarUiToolbar_showMenuItemsWhileSearching, false);
+ String searchHint = a.getString(R.styleable.CarUiToolbar_searchHint);
if (searchHint != null) {
setSearchHint(searchHint);
}
- switch (a.getInt(R.styleable.ChassisToolbar_state, 0)) {
+ switch (a.getInt(R.styleable.CarUiToolbar_state, 0)) {
case 0:
setState(State.HOME);
break;
@@ -276,7 +276,7 @@
@Override
public void setBackground(Drawable d) {
throw new UnsupportedOperationException(
- "You can not change the background of a chassis toolbar, use "
+ "You can not change the background of a CarUi toolbar, use "
+ "setBackgroundShown(boolean) or an RRO instead.");
}
@@ -326,7 +326,7 @@
}
private void createOverflowDialog() {
- // TODO(b/140564530) Use a chassis alert with a (paged)recyclerview here
+ // TODO(b/140564530) Use a carui alert with a (paged)recyclerview here
// TODO(b/140563930) Support enabled/disabled overflow items
CharSequence[] itemTitles = mOverflowItems.stream()
diff --git a/car-chassis-lib/tests/paintbooth/AndroidManifest-gradle.xml b/car-chassis-lib/tests/paintbooth/AndroidManifest-gradle.xml
index d812c74..b79960e 100644
--- a/car-chassis-lib/tests/paintbooth/AndroidManifest-gradle.xml
+++ b/car-chassis-lib/tests/paintbooth/AndroidManifest-gradle.xml
@@ -21,7 +21,7 @@
<application
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
- android:theme="@style/ChassisTheme">
+ android:theme="@style/CarUiTheme">
<activity
android:name=".MainActivity"
android:exported="true">
diff --git a/car-chassis-lib/tests/paintbooth/AndroidManifest.xml b/car-chassis-lib/tests/paintbooth/AndroidManifest.xml
index d9a8c4f..c39cbc5 100644
--- a/car-chassis-lib/tests/paintbooth/AndroidManifest.xml
+++ b/car-chassis-lib/tests/paintbooth/AndroidManifest.xml
@@ -25,7 +25,7 @@
<application
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
- android:theme="@style/ChassisTheme">
+ android:theme="@style/CarUiTheme">
<activity
android:name=".MainActivity"
android:exported="true">
diff --git a/car-chassis-lib/tests/paintbooth/build.gradle b/car-chassis-lib/tests/paintbooth/build.gradle
index b89f0f7..099d180 100644
--- a/car-chassis-lib/tests/paintbooth/build.gradle
+++ b/car-chassis-lib/tests/paintbooth/build.gradle
@@ -19,7 +19,7 @@
android {
compileSdkVersion 28
defaultConfig {
- applicationId "com.android.car.chassis.paintbooth"
+ applicationId "com.android.car.ui.paintbooth"
minSdkVersion 28
targetSdkVersion 28
versionCode 1
