Rename folder from chassis to car-ui-lib
Bug: 140950423
Test: build and deploy test app
Change-Id: I1016415ffb3b0a80fd0c07c125a1cd82a38f137b
diff --git a/car-apps-common/src/com/android/car/apps/common/ClickThroughToolbar.java b/car-apps-common/src/com/android/car/apps/common/ClickThroughToolbar.java
index 9781318..3a05111 100644
--- a/car-apps-common/src/com/android/car/apps/common/ClickThroughToolbar.java
+++ b/car-apps-common/src/com/android/car/apps/common/ClickThroughToolbar.java
@@ -28,7 +28,7 @@
* <p>By default, the {@link Toolbar} eats all touches on it. This view will override
* {@link #onTouchEvent(MotionEvent)} and return {@code false} if configured to allow pass through.
*
- * @deprecated Use {@link com.android.car.chassis.Toolbar} instead
+ * @deprecated Use {@link com.android.car.ui.Toolbar} instead
*/
@Deprecated
public class ClickThroughToolbar extends Toolbar {
diff --git a/car-apps-common/src/com/android/car/apps/common/widget/CarTabLayout.java b/car-apps-common/src/com/android/car/apps/common/widget/CarTabLayout.java
index 2184907..e9cd317 100644
--- a/car-apps-common/src/com/android/car/apps/common/widget/CarTabLayout.java
+++ b/car-apps-common/src/com/android/car/apps/common/widget/CarTabLayout.java
@@ -59,7 +59,7 @@
* <p>Touch feedback is using @android:attr/selectableItemBackground.
*
* @param <T> Presents a CarTab entity
- * @deprecated Use {@link com.android.car.chassis.TabLayout} instead
+ * @deprecated Use {@link com.android.car.ui.TabLayout} instead
*/
@Deprecated
public class CarTabLayout<T extends CarTabLayout.CarTab> extends LinearLayout {
diff --git a/car-chassis-lib/.gitignore b/car-ui-lib/.gitignore
similarity index 100%
rename from car-chassis-lib/.gitignore
rename to car-ui-lib/.gitignore
diff --git a/car-chassis-lib/Android.mk b/car-ui-lib/Android.mk
similarity index 97%
rename from car-chassis-lib/Android.mk
rename to car-ui-lib/Android.mk
index 3a03d62..6f280bb 100644
--- a/car-chassis-lib/Android.mk
+++ b/car-ui-lib/Android.mk
@@ -22,7 +22,7 @@
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_MODULE := car-chassis-lib
+LOCAL_MODULE := car-ui-lib
LOCAL_MODULE_TAGS := optional
diff --git a/car-chassis-lib/AndroidManifest-gradle.xml b/car-ui-lib/AndroidManifest-gradle.xml
similarity index 100%
rename from car-chassis-lib/AndroidManifest-gradle.xml
rename to car-ui-lib/AndroidManifest-gradle.xml
diff --git a/car-chassis-lib/AndroidManifest.xml b/car-ui-lib/AndroidManifest.xml
similarity index 100%
rename from car-chassis-lib/AndroidManifest.xml
rename to car-ui-lib/AndroidManifest.xml
diff --git a/car-chassis-lib/README.md b/car-ui-lib/README.md
similarity index 94%
rename from car-chassis-lib/README.md
rename to car-ui-lib/README.md
index fed3893..282f8e1 100644
--- a/car-chassis-lib/README.md
+++ b/car-ui-lib/README.md
@@ -14,7 +14,7 @@
This library is developed in Gerrit and copied as source to Google3 using
Copybara (go/copybara).
-Source: /packages/apps/Car/libs/car-chassis-lib
+Source: /packages/apps/Car/libs/car-ui-lib
Target: //google3/third_party/java/android_libs/android_car_chassis_lib
Here is the process for updating this library:
diff --git a/car-chassis-lib/build.gradle b/car-ui-lib/build.gradle
similarity index 100%
rename from car-chassis-lib/build.gradle
rename to car-ui-lib/build.gradle
diff --git a/car-chassis-lib/gradle.properties b/car-ui-lib/gradle.properties
similarity index 100%
rename from car-chassis-lib/gradle.properties
rename to car-ui-lib/gradle.properties
diff --git a/car-chassis-lib/gradlew b/car-ui-lib/gradlew
similarity index 100%
rename from car-chassis-lib/gradlew
rename to car-ui-lib/gradlew
diff --git a/car-chassis-lib/gradlew.bat b/car-ui-lib/gradlew.bat
similarity index 100%
rename from car-chassis-lib/gradlew.bat
rename to car-ui-lib/gradlew.bat
diff --git a/car-chassis-lib/res/color/car_ui_tab_item_selector.xml b/car-ui-lib/res/color/car_ui_tab_item_selector.xml
similarity index 100%
rename from car-chassis-lib/res/color/car_ui_tab_item_selector.xml
rename to car-ui-lib/res/color/car_ui_tab_item_selector.xml
diff --git a/car-chassis-lib/res/color/car_ui_toolbar_icon_tint.xml b/car-ui-lib/res/color/car_ui_toolbar_icon_tint.xml
similarity index 100%
rename from car-chassis-lib/res/color/car_ui_toolbar_icon_tint.xml
rename to car-ui-lib/res/color/car_ui_toolbar_icon_tint.xml
diff --git a/car-chassis-lib/res/color/car_ui_toolbar_menu_item_icon_color.xml b/car-ui-lib/res/color/car_ui_toolbar_menu_item_icon_color.xml
similarity index 100%
rename from car-chassis-lib/res/color/car_ui_toolbar_menu_item_icon_color.xml
rename to car-ui-lib/res/color/car_ui_toolbar_menu_item_icon_color.xml
diff --git a/car-chassis-lib/res/drawable/car_ui_divider.xml b/car-ui-lib/res/drawable/car_ui_divider.xml
similarity index 100%
rename from car-chassis-lib/res/drawable/car_ui_divider.xml
rename to car-ui-lib/res/drawable/car_ui_divider.xml
diff --git a/car-chassis-lib/res/drawable/car_ui_icon_arrow_back.xml b/car-ui-lib/res/drawable/car_ui_icon_arrow_back.xml
similarity index 100%
rename from car-chassis-lib/res/drawable/car_ui_icon_arrow_back.xml
rename to car-ui-lib/res/drawable/car_ui_icon_arrow_back.xml
diff --git a/car-chassis-lib/res/drawable/car_ui_icon_close.xml b/car-ui-lib/res/drawable/car_ui_icon_close.xml
similarity index 100%
rename from car-chassis-lib/res/drawable/car_ui_icon_close.xml
rename to car-ui-lib/res/drawable/car_ui_icon_close.xml
diff --git a/car-chassis-lib/res/drawable/car_ui_icon_overflow_menu.xml b/car-ui-lib/res/drawable/car_ui_icon_overflow_menu.xml
similarity index 100%
rename from car-chassis-lib/res/drawable/car_ui_icon_overflow_menu.xml
rename to car-ui-lib/res/drawable/car_ui_icon_overflow_menu.xml
diff --git a/car-chassis-lib/res/drawable/car_ui_icon_search.xml b/car-ui-lib/res/drawable/car_ui_icon_search.xml
similarity index 100%
rename from car-chassis-lib/res/drawable/car_ui_icon_search.xml
rename to car-ui-lib/res/drawable/car_ui_icon_search.xml
diff --git a/car-chassis-lib/res/drawable/car_ui_icon_settings.xml b/car-ui-lib/res/drawable/car_ui_icon_settings.xml
similarity index 100%
rename from car-chassis-lib/res/drawable/car_ui_icon_settings.xml
rename to car-ui-lib/res/drawable/car_ui_icon_settings.xml
diff --git a/car-chassis-lib/res/drawable/car_ui_pagedrecyclerview_button_ripple_background.xml b/car-ui-lib/res/drawable/car_ui_pagedrecyclerview_button_ripple_background.xml
similarity index 100%
rename from car-chassis-lib/res/drawable/car_ui_pagedrecyclerview_button_ripple_background.xml
rename to car-ui-lib/res/drawable/car_ui_pagedrecyclerview_button_ripple_background.xml
diff --git a/car-chassis-lib/res/drawable/car_ui_pagedrecyclerview_divider.xml b/car-ui-lib/res/drawable/car_ui_pagedrecyclerview_divider.xml
similarity index 100%
rename from car-chassis-lib/res/drawable/car_ui_pagedrecyclerview_divider.xml
rename to car-ui-lib/res/drawable/car_ui_pagedrecyclerview_divider.xml
diff --git a/car-chassis-lib/res/drawable/car_ui_pagedrecyclerview_ic_down.xml b/car-ui-lib/res/drawable/car_ui_pagedrecyclerview_ic_down.xml
similarity index 100%
rename from car-chassis-lib/res/drawable/car_ui_pagedrecyclerview_ic_down.xml
rename to car-ui-lib/res/drawable/car_ui_pagedrecyclerview_ic_down.xml
diff --git a/car-chassis-lib/res/drawable/car_ui_pagedrecyclerview_ic_up.xml b/car-ui-lib/res/drawable/car_ui_pagedrecyclerview_ic_up.xml
similarity index 100%
rename from car-chassis-lib/res/drawable/car_ui_pagedrecyclerview_ic_up.xml
rename to car-ui-lib/res/drawable/car_ui_pagedrecyclerview_ic_up.xml
diff --git a/car-chassis-lib/res/drawable/car_ui_pagedrecyclerview_scrollbar_thumb.xml b/car-ui-lib/res/drawable/car_ui_pagedrecyclerview_scrollbar_thumb.xml
similarity index 100%
rename from car-chassis-lib/res/drawable/car_ui_pagedrecyclerview_scrollbar_thumb.xml
rename to car-ui-lib/res/drawable/car_ui_pagedrecyclerview_scrollbar_thumb.xml
diff --git a/car-chassis-lib/res/drawable/car_ui_toolbar_icon_background.xml b/car-ui-lib/res/drawable/car_ui_toolbar_icon_background.xml
similarity index 100%
rename from car-chassis-lib/res/drawable/car_ui_toolbar_icon_background.xml
rename to car-ui-lib/res/drawable/car_ui_toolbar_icon_background.xml
diff --git a/car-chassis-lib/res/drawable/car_ui_toolbar_menu_item_divider.xml b/car-ui-lib/res/drawable/car_ui_toolbar_menu_item_divider.xml
similarity index 100%
rename from car-chassis-lib/res/drawable/car_ui_toolbar_menu_item_divider.xml
rename to car-ui-lib/res/drawable/car_ui_toolbar_menu_item_divider.xml
diff --git a/car-chassis-lib/res/layout-port/car_ui_toolbar.xml b/car-ui-lib/res/layout-port/car_ui_toolbar.xml
similarity index 100%
rename from car-chassis-lib/res/layout-port/car_ui_toolbar.xml
rename to car-ui-lib/res/layout-port/car_ui_toolbar.xml
diff --git a/car-chassis-lib/res/layout/car_ui_paged_recycler_view_item.xml b/car-ui-lib/res/layout/car_ui_paged_recycler_view_item.xml
similarity index 100%
rename from car-chassis-lib/res/layout/car_ui_paged_recycler_view_item.xml
rename to car-ui-lib/res/layout/car_ui_paged_recycler_view_item.xml
diff --git a/car-chassis-lib/res/layout/car_ui_pagedrecyclerview_scrollbar.xml b/car-ui-lib/res/layout/car_ui_pagedrecyclerview_scrollbar.xml
similarity index 100%
rename from car-chassis-lib/res/layout/car_ui_pagedrecyclerview_scrollbar.xml
rename to car-ui-lib/res/layout/car_ui_pagedrecyclerview_scrollbar.xml
diff --git a/car-chassis-lib/res/layout/car_ui_preference.xml b/car-ui-lib/res/layout/car_ui_preference.xml
similarity index 100%
rename from car-chassis-lib/res/layout/car_ui_preference.xml
rename to car-ui-lib/res/layout/car_ui_preference.xml
diff --git a/car-chassis-lib/res/layout/car_ui_preference_category.xml b/car-ui-lib/res/layout/car_ui_preference_category.xml
similarity index 100%
rename from car-chassis-lib/res/layout/car_ui_preference_category.xml
rename to car-ui-lib/res/layout/car_ui_preference_category.xml
diff --git a/car-chassis-lib/res/layout/car_ui_preference_dialog_edittext.xml b/car-ui-lib/res/layout/car_ui_preference_dialog_edittext.xml
similarity index 100%
rename from car-chassis-lib/res/layout/car_ui_preference_dialog_edittext.xml
rename to car-ui-lib/res/layout/car_ui_preference_dialog_edittext.xml
diff --git a/car-chassis-lib/res/layout/car_ui_preference_dropdown.xml b/car-ui-lib/res/layout/car_ui_preference_dropdown.xml
similarity index 100%
rename from car-chassis-lib/res/layout/car_ui_preference_dropdown.xml
rename to car-ui-lib/res/layout/car_ui_preference_dropdown.xml
diff --git a/car-chassis-lib/res/layout/car_ui_preference_fragment.xml b/car-ui-lib/res/layout/car_ui_preference_fragment.xml
similarity index 100%
rename from car-chassis-lib/res/layout/car_ui_preference_fragment.xml
rename to car-ui-lib/res/layout/car_ui_preference_fragment.xml
diff --git a/car-chassis-lib/res/layout/car_ui_preference_widget_checkbox.xml b/car-ui-lib/res/layout/car_ui_preference_widget_checkbox.xml
similarity index 100%
rename from car-chassis-lib/res/layout/car_ui_preference_widget_checkbox.xml
rename to car-ui-lib/res/layout/car_ui_preference_widget_checkbox.xml
diff --git a/car-chassis-lib/res/layout/car_ui_preference_widget_seekbar.xml b/car-ui-lib/res/layout/car_ui_preference_widget_seekbar.xml
similarity index 100%
rename from car-chassis-lib/res/layout/car_ui_preference_widget_seekbar.xml
rename to car-ui-lib/res/layout/car_ui_preference_widget_seekbar.xml
diff --git a/car-chassis-lib/res/layout/car_ui_preference_widget_switch.xml b/car-ui-lib/res/layout/car_ui_preference_widget_switch.xml
similarity index 100%
rename from car-chassis-lib/res/layout/car_ui_preference_widget_switch.xml
rename to car-ui-lib/res/layout/car_ui_preference_widget_switch.xml
diff --git a/car-chassis-lib/res/layout/car_ui_search_view.xml b/car-ui-lib/res/layout/car_ui_search_view.xml
similarity index 100%
rename from car-chassis-lib/res/layout/car_ui_search_view.xml
rename to car-ui-lib/res/layout/car_ui_search_view.xml
diff --git a/car-chassis-lib/res/layout/car_ui_tab_item.xml b/car-ui-lib/res/layout/car_ui_tab_item.xml
similarity index 100%
rename from car-chassis-lib/res/layout/car_ui_tab_item.xml
rename to car-ui-lib/res/layout/car_ui_tab_item.xml
diff --git a/car-chassis-lib/res/layout/car_ui_toolbar.xml b/car-ui-lib/res/layout/car_ui_toolbar.xml
similarity index 100%
rename from car-chassis-lib/res/layout/car_ui_toolbar.xml
rename to car-ui-lib/res/layout/car_ui_toolbar.xml
diff --git a/car-chassis-lib/res/layout/car_ui_toolbar_menu_item_icon.xml b/car-ui-lib/res/layout/car_ui_toolbar_menu_item_icon.xml
similarity index 100%
rename from car-chassis-lib/res/layout/car_ui_toolbar_menu_item_icon.xml
rename to car-ui-lib/res/layout/car_ui_toolbar_menu_item_icon.xml
diff --git a/car-chassis-lib/res/layout/car_ui_toolbar_menu_item_switch.xml b/car-ui-lib/res/layout/car_ui_toolbar_menu_item_switch.xml
similarity index 100%
rename from car-chassis-lib/res/layout/car_ui_toolbar_menu_item_switch.xml
rename to car-ui-lib/res/layout/car_ui_toolbar_menu_item_switch.xml
diff --git a/car-chassis-lib/res/layout/car_ui_toolbar_menu_item_text.xml b/car-ui-lib/res/layout/car_ui_toolbar_menu_item_text.xml
similarity index 100%
rename from car-chassis-lib/res/layout/car_ui_toolbar_menu_item_text.xml
rename to car-ui-lib/res/layout/car_ui_toolbar_menu_item_text.xml
diff --git a/car-chassis-lib/res/values-port/values.xml b/car-ui-lib/res/values-port/values.xml
similarity index 100%
rename from car-chassis-lib/res/values-port/values.xml
rename to car-ui-lib/res/values-port/values.xml
diff --git a/car-chassis-lib/res/values/attrs.xml b/car-ui-lib/res/values/attrs.xml
similarity index 100%
rename from car-chassis-lib/res/values/attrs.xml
rename to car-ui-lib/res/values/attrs.xml
diff --git a/car-chassis-lib/res/values/bools.xml b/car-ui-lib/res/values/bools.xml
similarity index 100%
rename from car-chassis-lib/res/values/bools.xml
rename to car-ui-lib/res/values/bools.xml
diff --git a/car-chassis-lib/res/values/colors.xml b/car-ui-lib/res/values/colors.xml
similarity index 100%
rename from car-chassis-lib/res/values/colors.xml
rename to car-ui-lib/res/values/colors.xml
diff --git a/car-chassis-lib/res/values/config.xml b/car-ui-lib/res/values/config.xml
similarity index 100%
rename from car-chassis-lib/res/values/config.xml
rename to car-ui-lib/res/values/config.xml
diff --git a/car-chassis-lib/res/values/dimens.xml b/car-ui-lib/res/values/dimens.xml
similarity index 100%
rename from car-chassis-lib/res/values/dimens.xml
rename to car-ui-lib/res/values/dimens.xml
diff --git a/car-chassis-lib/res/values/ids.xml b/car-ui-lib/res/values/ids.xml
similarity index 100%
rename from car-chassis-lib/res/values/ids.xml
rename to car-ui-lib/res/values/ids.xml
diff --git a/car-chassis-lib/res/values/integers.xml b/car-ui-lib/res/values/integers.xml
similarity index 100%
rename from car-chassis-lib/res/values/integers.xml
rename to car-ui-lib/res/values/integers.xml
diff --git a/car-chassis-lib/res/values/strings.xml b/car-ui-lib/res/values/strings.xml
similarity index 100%
rename from car-chassis-lib/res/values/strings.xml
rename to car-ui-lib/res/values/strings.xml
diff --git a/car-chassis-lib/res/values/styles.xml b/car-ui-lib/res/values/styles.xml
similarity index 100%
rename from car-chassis-lib/res/values/styles.xml
rename to car-ui-lib/res/values/styles.xml
diff --git a/car-chassis-lib/res/values/themes.xml b/car-ui-lib/res/values/themes.xml
similarity index 100%
rename from car-chassis-lib/res/values/themes.xml
rename to car-ui-lib/res/values/themes.xml
diff --git a/car-chassis-lib/res/values/values.xml b/car-ui-lib/res/values/values.xml
similarity index 100%
rename from car-chassis-lib/res/values/values.xml
rename to car-ui-lib/res/values/values.xml
diff --git a/car-chassis-lib/settings.gradle b/car-ui-lib/settings.gradle
similarity index 100%
rename from car-chassis-lib/settings.gradle
rename to car-ui-lib/settings.gradle
diff --git a/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/CarUxRestrictionsUtil.java b/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/CarUxRestrictionsUtil.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/CarUxRestrictionsUtil.java
rename to car-ui-lib/src/com/android/car/ui/pagedrecyclerview/CarUxRestrictionsUtil.java
diff --git a/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/DefaultScrollBar.java b/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/DefaultScrollBar.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/DefaultScrollBar.java
rename to car-ui-lib/src/com/android/car/ui/pagedrecyclerview/DefaultScrollBar.java
diff --git a/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java b/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java
rename to car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java
diff --git a/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerViewAdapter.java b/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerViewAdapter.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerViewAdapter.java
rename to car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerViewAdapter.java
diff --git a/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedSmoothScroller.java b/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedSmoothScroller.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedSmoothScroller.java
rename to car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedSmoothScroller.java
diff --git a/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedSnapHelper.java b/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedSnapHelper.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedSnapHelper.java
rename to car-ui-lib/src/com/android/car/ui/pagedrecyclerview/PagedSnapHelper.java
diff --git a/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/ScrollBar.java b/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/ScrollBar.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/ScrollBar.java
rename to car-ui-lib/src/com/android/car/ui/pagedrecyclerview/ScrollBar.java
diff --git a/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/grid/GridDividerItemDecoration.java b/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/decorations/grid/GridDividerItemDecoration.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/grid/GridDividerItemDecoration.java
rename to car-ui-lib/src/com/android/car/ui/pagedrecyclerview/decorations/grid/GridDividerItemDecoration.java
diff --git a/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/grid/GridOffsetItemDecoration.java b/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/decorations/grid/GridOffsetItemDecoration.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/grid/GridOffsetItemDecoration.java
rename to car-ui-lib/src/com/android/car/ui/pagedrecyclerview/decorations/grid/GridOffsetItemDecoration.java
diff --git a/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/linear/LinearDividerItemDecoration.java b/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/decorations/linear/LinearDividerItemDecoration.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/linear/LinearDividerItemDecoration.java
rename to car-ui-lib/src/com/android/car/ui/pagedrecyclerview/decorations/linear/LinearDividerItemDecoration.java
diff --git a/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/linear/LinearOffsetItemDecoration.java b/car-ui-lib/src/com/android/car/ui/pagedrecyclerview/decorations/linear/LinearOffsetItemDecoration.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/linear/LinearOffsetItemDecoration.java
rename to car-ui-lib/src/com/android/car/ui/pagedrecyclerview/decorations/linear/LinearOffsetItemDecoration.java
diff --git a/car-chassis-lib/src/com/android/car/ui/preference/EditTextPreferenceDialogFragment.java b/car-ui-lib/src/com/android/car/ui/preference/EditTextPreferenceDialogFragment.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/preference/EditTextPreferenceDialogFragment.java
rename to car-ui-lib/src/com/android/car/ui/preference/EditTextPreferenceDialogFragment.java
diff --git a/car-chassis-lib/src/com/android/car/ui/preference/ListPreferenceDialogFragment.java b/car-ui-lib/src/com/android/car/ui/preference/ListPreferenceDialogFragment.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/preference/ListPreferenceDialogFragment.java
rename to car-ui-lib/src/com/android/car/ui/preference/ListPreferenceDialogFragment.java
diff --git a/car-chassis-lib/src/com/android/car/ui/preference/MultiSelectListPreferenceDialogFragment.java b/car-ui-lib/src/com/android/car/ui/preference/MultiSelectListPreferenceDialogFragment.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/preference/MultiSelectListPreferenceDialogFragment.java
rename to car-ui-lib/src/com/android/car/ui/preference/MultiSelectListPreferenceDialogFragment.java
diff --git a/car-chassis-lib/src/com/android/car/ui/preference/PreferenceDialogFragment.java b/car-ui-lib/src/com/android/car/ui/preference/PreferenceDialogFragment.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/preference/PreferenceDialogFragment.java
rename to car-ui-lib/src/com/android/car/ui/preference/PreferenceDialogFragment.java
diff --git a/car-chassis-lib/src/com/android/car/ui/toolbar/MenuItem.java b/car-ui-lib/src/com/android/car/ui/toolbar/MenuItem.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/toolbar/MenuItem.java
rename to car-ui-lib/src/com/android/car/ui/toolbar/MenuItem.java
diff --git a/car-chassis-lib/src/com/android/car/ui/toolbar/SearchView.java b/car-ui-lib/src/com/android/car/ui/toolbar/SearchView.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/toolbar/SearchView.java
rename to car-ui-lib/src/com/android/car/ui/toolbar/SearchView.java
diff --git a/car-chassis-lib/src/com/android/car/ui/toolbar/TabLayout.java b/car-ui-lib/src/com/android/car/ui/toolbar/TabLayout.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/toolbar/TabLayout.java
rename to car-ui-lib/src/com/android/car/ui/toolbar/TabLayout.java
diff --git a/car-chassis-lib/src/com/android/car/ui/toolbar/Toolbar.java b/car-ui-lib/src/com/android/car/ui/toolbar/Toolbar.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/toolbar/Toolbar.java
rename to car-ui-lib/src/com/android/car/ui/toolbar/Toolbar.java
diff --git a/car-chassis-lib/src/com/android/car/ui/utils/ResourceUtils.java b/car-ui-lib/src/com/android/car/ui/utils/ResourceUtils.java
similarity index 100%
rename from car-chassis-lib/src/com/android/car/ui/utils/ResourceUtils.java
rename to car-ui-lib/src/com/android/car/ui/utils/ResourceUtils.java
diff --git a/car-chassis-lib/tests/Android.mk b/car-ui-lib/tests/Android.mk
similarity index 100%
rename from car-chassis-lib/tests/Android.mk
rename to car-ui-lib/tests/Android.mk
diff --git a/car-chassis-lib/tests/paintbooth/Android.mk b/car-ui-lib/tests/paintbooth/Android.mk
similarity index 97%
rename from car-chassis-lib/tests/paintbooth/Android.mk
rename to car-ui-lib/tests/paintbooth/Android.mk
index 5683038..b33546d 100644
--- a/car-chassis-lib/tests/paintbooth/Android.mk
+++ b/car-ui-lib/tests/paintbooth/Android.mk
@@ -33,7 +33,7 @@
LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_ANDROID_LIBRARIES := \
- car-chassis-lib
+ car-ui-lib
LOCAL_USE_AAPT2 := true
diff --git a/car-chassis-lib/tests/paintbooth/AndroidManifest-gradle.xml b/car-ui-lib/tests/paintbooth/AndroidManifest-gradle.xml
similarity index 100%
rename from car-chassis-lib/tests/paintbooth/AndroidManifest-gradle.xml
rename to car-ui-lib/tests/paintbooth/AndroidManifest-gradle.xml
diff --git a/car-chassis-lib/tests/paintbooth/AndroidManifest.xml b/car-ui-lib/tests/paintbooth/AndroidManifest.xml
similarity index 100%
rename from car-chassis-lib/tests/paintbooth/AndroidManifest.xml
rename to car-ui-lib/tests/paintbooth/AndroidManifest.xml
diff --git a/car-chassis-lib/tests/paintbooth/build.gradle b/car-ui-lib/tests/paintbooth/build.gradle
similarity index 100%
rename from car-chassis-lib/tests/paintbooth/build.gradle
rename to car-ui-lib/tests/paintbooth/build.gradle
diff --git a/car-chassis-lib/tests/paintbooth/res/drawable/ic_launcher.png b/car-ui-lib/tests/paintbooth/res/drawable/ic_launcher.png
similarity index 100%
rename from car-chassis-lib/tests/paintbooth/res/drawable/ic_launcher.png
rename to car-ui-lib/tests/paintbooth/res/drawable/ic_launcher.png
Binary files differ
diff --git a/car-chassis-lib/tests/paintbooth/res/layout/dialogs_activity.xml b/car-ui-lib/tests/paintbooth/res/layout/dialogs_activity.xml
similarity index 100%
rename from car-chassis-lib/tests/paintbooth/res/layout/dialogs_activity.xml
rename to car-ui-lib/tests/paintbooth/res/layout/dialogs_activity.xml
diff --git a/car-chassis-lib/tests/paintbooth/res/layout/list_item.xml b/car-ui-lib/tests/paintbooth/res/layout/list_item.xml
similarity index 100%
rename from car-chassis-lib/tests/paintbooth/res/layout/list_item.xml
rename to car-ui-lib/tests/paintbooth/res/layout/list_item.xml
diff --git a/car-chassis-lib/tests/paintbooth/res/layout/main_activity.xml b/car-ui-lib/tests/paintbooth/res/layout/main_activity.xml
similarity index 100%
rename from car-chassis-lib/tests/paintbooth/res/layout/main_activity.xml
rename to car-ui-lib/tests/paintbooth/res/layout/main_activity.xml
diff --git a/car-chassis-lib/tests/paintbooth/res/values/colors.xml b/car-ui-lib/tests/paintbooth/res/values/colors.xml
similarity index 100%
rename from car-chassis-lib/tests/paintbooth/res/values/colors.xml
rename to car-ui-lib/tests/paintbooth/res/values/colors.xml
diff --git a/car-chassis-lib/tests/paintbooth/res/values/strings.xml b/car-ui-lib/tests/paintbooth/res/values/strings.xml
similarity index 100%
rename from car-chassis-lib/tests/paintbooth/res/values/strings.xml
rename to car-ui-lib/tests/paintbooth/res/values/strings.xml
diff --git a/car-chassis-lib/tests/paintbooth/src/com/android/car/ui/paintbooth/DialogsActivity.java b/car-ui-lib/tests/paintbooth/src/com/android/car/ui/paintbooth/DialogsActivity.java
similarity index 100%
rename from car-chassis-lib/tests/paintbooth/src/com/android/car/ui/paintbooth/DialogsActivity.java
rename to car-ui-lib/tests/paintbooth/src/com/android/car/ui/paintbooth/DialogsActivity.java
diff --git a/car-chassis-lib/tests/paintbooth/src/com/android/car/ui/paintbooth/MainActivity.java b/car-ui-lib/tests/paintbooth/src/com/android/car/ui/paintbooth/MainActivity.java
similarity index 100%
rename from car-chassis-lib/tests/paintbooth/src/com/android/car/ui/paintbooth/MainActivity.java
rename to car-ui-lib/tests/paintbooth/src/com/android/car/ui/paintbooth/MainActivity.java
