Package rename of com.android.car.chassis to com.android.car.ui
Bug: 140950423
Test: build and deploy test app
Change-Id: I47ec495cf0cbf2358a32a5ae5d8e4a7789022459
diff --git a/car-chassis-lib/AndroidManifest-gradle.xml b/car-chassis-lib/AndroidManifest-gradle.xml
index 6844663..b6e8ee6 100644
--- a/car-chassis-lib/AndroidManifest-gradle.xml
+++ b/car-chassis-lib/AndroidManifest-gradle.xml
@@ -16,5 +16,5 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.car.chassis">
+ package="com.android.car.ui">
</manifest>
diff --git a/car-chassis-lib/AndroidManifest.xml b/car-chassis-lib/AndroidManifest.xml
index c398dc1..038ee67 100644
--- a/car-chassis-lib/AndroidManifest.xml
+++ b/car-chassis-lib/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.car.chassis">
+ package="com.android.car.ui">
<uses-sdk
android:minSdkVersion="14"
android:targetSdkVersion="28" />
diff --git a/car-chassis-lib/res/layout-port/chassis_toolbar.xml b/car-chassis-lib/res/layout-port/chassis_toolbar.xml
index 9d86e34..f425ab8 100644
--- a/car-chassis-lib/res/layout-port/chassis_toolbar.xml
+++ b/car-chassis-lib/res/layout-port/chassis_toolbar.xml
@@ -69,7 +69,7 @@
app:layout_constraintStart_toEndOf="@id/nav_icon_container"
app:layout_constraintEnd_toStartOf="@id/menu_items_container"/>
- <com.android.car.chassis.toolbar.SearchView
+ <com.android.car.ui.toolbar.SearchView
android:id="@+id/search_view"
android:layout_width="0dp"
android:layout_height="match_parent"
@@ -118,7 +118,7 @@
android:tintMode="src_in"/>
</FrameLayout>
- <com.android.car.chassis.toolbar.TabLayout
+ <com.android.car.ui.toolbar.TabLayout
android:id="@+id/tabs"
android:layout_width="match_parent"
android:layout_height="@dimen/chassis_toolbar_second_row_height"
diff --git a/car-chassis-lib/res/layout/chassis_toolbar.xml b/car-chassis-lib/res/layout/chassis_toolbar.xml
index e8b09cb..b71bd43 100644
--- a/car-chassis-lib/res/layout/chassis_toolbar.xml
+++ b/car-chassis-lib/res/layout/chassis_toolbar.xml
@@ -54,7 +54,7 @@
app:layout_constraintStart_toEndOf="@+id/nav_icon_container"
app:layout_constraintEnd_toStartOf="@+id/menu_items_container"/>
- <com.android.car.chassis.toolbar.TabLayout
+ <com.android.car.ui.toolbar.TabLayout
android:id="@+id/tabs"
android:layout_width="wrap_content"
android:layout_height="0dp"
@@ -104,7 +104,7 @@
android:tintMode="src_in"/>
</FrameLayout>
- <com.android.car.chassis.toolbar.SearchView
+ <com.android.car.ui.toolbar.SearchView
android:id="@+id/search_view"
android:layout_width="0dp"
android:layout_height="match_parent"
diff --git a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/CarUxRestrictionsUtil.java b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/CarUxRestrictionsUtil.java
similarity index 98%
rename from car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/CarUxRestrictionsUtil.java
rename to car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/CarUxRestrictionsUtil.java
index 7e204bd..e156887 100644
--- a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/CarUxRestrictionsUtil.java
+++ b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/CarUxRestrictionsUtil.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.chassis.pagedrecyclerview;
+package com.android.car.ui.pagedrecyclerview;
import static android.car.drivingstate.CarUxRestrictions.UX_RESTRICTIONS_LIMIT_STRING_LENGTH;
@@ -28,7 +28,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.android.car.chassis.R;
+import com.android.car.ui.R;
import java.util.Collections;
import java.util.Set;
diff --git a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/DefaultScrollBar.java b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/DefaultScrollBar.java
similarity index 98%
rename from car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/DefaultScrollBar.java
rename to car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/DefaultScrollBar.java
index 758b61c..42a1aa8 100644
--- a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/DefaultScrollBar.java
+++ b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/DefaultScrollBar.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.chassis.pagedrecyclerview;
+package com.android.car.ui.pagedrecyclerview;
import android.content.Context;
import android.content.res.Resources;
@@ -32,9 +32,9 @@
import androidx.recyclerview.widget.OrientationHelper;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.car.chassis.R;
-import com.android.car.chassis.pagedrecyclerview.PagedRecyclerView.ScrollBarPosition;
-import com.android.car.chassis.utils.ResourceUtils;
+import com.android.car.ui.R;
+import com.android.car.ui.pagedrecyclerview.PagedRecyclerView.ScrollBarPosition;
+import com.android.car.ui.utils.ResourceUtils;
/**
* The default scroll bar widget for the {@link PagedRecyclerView}.
diff --git a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/PagedRecyclerView.java b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java
similarity index 97%
rename from car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/PagedRecyclerView.java
rename to car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java
index 8891525..bdfc650 100644
--- a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/PagedRecyclerView.java
+++ b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerView.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.chassis.pagedrecyclerview;
+package com.android.car.ui.pagedrecyclerview;
import static java.lang.annotation.RetentionPolicy.SOURCE;
@@ -37,12 +37,12 @@
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.car.chassis.R;
-import com.android.car.chassis.pagedrecyclerview.decorations.grid.GridDividerItemDecoration;
-import com.android.car.chassis.pagedrecyclerview.decorations.grid.GridOffsetItemDecoration;
-import com.android.car.chassis.pagedrecyclerview.decorations.linear.LinearDividerItemDecoration;
-import com.android.car.chassis.pagedrecyclerview.decorations.linear.LinearOffsetItemDecoration;
-import com.android.car.chassis.pagedrecyclerview.decorations.linear.LinearOffsetItemDecoration.OffsetPosition;
+import com.android.car.ui.R;
+import com.android.car.ui.pagedrecyclerview.decorations.grid.GridDividerItemDecoration;
+import com.android.car.ui.pagedrecyclerview.decorations.grid.GridOffsetItemDecoration;
+import com.android.car.ui.pagedrecyclerview.decorations.linear.LinearDividerItemDecoration;
+import com.android.car.ui.pagedrecyclerview.decorations.linear.LinearOffsetItemDecoration;
+import com.android.car.ui.pagedrecyclerview.decorations.linear.LinearOffsetItemDecoration.OffsetPosition;
import java.lang.annotation.Retention;
diff --git a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/PagedRecyclerViewAdapter.java b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerViewAdapter.java
similarity index 95%
rename from car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/PagedRecyclerViewAdapter.java
rename to car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerViewAdapter.java
index f3167ea..38a0c79 100644
--- a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/PagedRecyclerViewAdapter.java
+++ b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedRecyclerViewAdapter.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.chassis.pagedrecyclerview;
+package com.android.car.ui.pagedrecyclerview;
import android.view.LayoutInflater;
import android.view.View;
@@ -22,7 +22,7 @@
import androidx.recyclerview.widget.RecyclerView;
-import com.android.car.chassis.R;
+import com.android.car.ui.R;
/** The adapter for the parent recyclerview in {@link PagedRecyclerView} widget. */
final class PagedRecyclerViewAdapter
diff --git a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/PagedSmoothScroller.java b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedSmoothScroller.java
similarity index 95%
rename from car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/PagedSmoothScroller.java
rename to car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedSmoothScroller.java
index 53a4d44..005d766 100644
--- a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/PagedSmoothScroller.java
+++ b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedSmoothScroller.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.chassis.pagedrecyclerview;
+package com.android.car.ui.pagedrecyclerview;
import android.content.Context;
import android.util.DisplayMetrics;
@@ -24,8 +24,8 @@
import androidx.recyclerview.widget.LinearSmoothScroller;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.car.chassis.R;
-import com.android.car.chassis.utils.ResourceUtils;
+import com.android.car.ui.R;
+import com.android.car.ui.utils.ResourceUtils;
/**
* Code drop from {androidx.car.widget.PagedSmoothScroller}
diff --git a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/PagedSnapHelper.java b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedSnapHelper.java
similarity index 99%
rename from car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/PagedSnapHelper.java
rename to car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedSnapHelper.java
index 0d31a76..6d86b47 100644
--- a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/PagedSnapHelper.java
+++ b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/PagedSnapHelper.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.chassis.pagedrecyclerview;
+package com.android.car.ui.pagedrecyclerview;
import android.content.Context;
import android.view.View;
diff --git a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/ScrollBar.java b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/ScrollBar.java
similarity index 91%
rename from car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/ScrollBar.java
rename to car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/ScrollBar.java
index 40a673b..5aedadc 100644
--- a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/ScrollBar.java
+++ b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/ScrollBar.java
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.chassis.pagedrecyclerview;
+package com.android.car.ui.pagedrecyclerview;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.car.chassis.pagedrecyclerview.PagedRecyclerView.ScrollBarPosition;
+import com.android.car.ui.pagedrecyclerview.PagedRecyclerView.ScrollBarPosition;
/**
* An abstract class that defines required contract for a custom scroll bar for the {@link
diff --git a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/decorations/grid/GridDividerItemDecoration.java b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/grid/GridDividerItemDecoration.java
similarity index 98%
rename from car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/decorations/grid/GridDividerItemDecoration.java
rename to car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/grid/GridDividerItemDecoration.java
index adf9f28..6d1b1a9 100644
--- a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/decorations/grid/GridDividerItemDecoration.java
+++ b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/grid/GridDividerItemDecoration.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.chassis.pagedrecyclerview.decorations.grid;
+package com.android.car.ui.pagedrecyclerview.decorations.grid;
import android.graphics.Canvas;
import android.graphics.Rect;
diff --git a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/decorations/grid/GridOffsetItemDecoration.java b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/grid/GridOffsetItemDecoration.java
similarity index 98%
rename from car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/decorations/grid/GridOffsetItemDecoration.java
rename to car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/grid/GridOffsetItemDecoration.java
index e290763..b7ce10c 100644
--- a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/decorations/grid/GridOffsetItemDecoration.java
+++ b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/grid/GridOffsetItemDecoration.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.chassis.pagedrecyclerview.decorations.grid;
+package com.android.car.ui.pagedrecyclerview.decorations.grid;
import static java.lang.annotation.RetentionPolicy.SOURCE;
diff --git a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/decorations/linear/LinearDividerItemDecoration.java b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/linear/LinearDividerItemDecoration.java
similarity index 98%
rename from car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/decorations/linear/LinearDividerItemDecoration.java
rename to car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/linear/LinearDividerItemDecoration.java
index b007cd3..612373c 100644
--- a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/decorations/linear/LinearDividerItemDecoration.java
+++ b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/linear/LinearDividerItemDecoration.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.chassis.pagedrecyclerview.decorations.linear;
+package com.android.car.ui.pagedrecyclerview.decorations.linear;
import android.graphics.Canvas;
import android.graphics.Rect;
diff --git a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/decorations/linear/LinearOffsetItemDecoration.java b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/linear/LinearOffsetItemDecoration.java
similarity index 98%
rename from car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/decorations/linear/LinearOffsetItemDecoration.java
rename to car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/linear/LinearOffsetItemDecoration.java
index f011843..de9335c 100644
--- a/car-chassis-lib/src/com/android/car/chassis/pagedrecyclerview/decorations/linear/LinearOffsetItemDecoration.java
+++ b/car-chassis-lib/src/com/android/car/ui/pagedrecyclerview/decorations/linear/LinearOffsetItemDecoration.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.chassis.pagedrecyclerview.decorations.linear;
+package com.android.car.ui.pagedrecyclerview.decorations.linear;
import static java.lang.annotation.RetentionPolicy.SOURCE;
diff --git a/car-chassis-lib/src/com/android/car/chassis/preference/EditTextPreferenceDialogFragment.java b/car-chassis-lib/src/com/android/car/ui/preference/EditTextPreferenceDialogFragment.java
similarity index 98%
rename from car-chassis-lib/src/com/android/car/chassis/preference/EditTextPreferenceDialogFragment.java
rename to car-chassis-lib/src/com/android/car/ui/preference/EditTextPreferenceDialogFragment.java
index b05eb5b..f2d7c3e 100644
--- a/car-chassis-lib/src/com/android/car/chassis/preference/EditTextPreferenceDialogFragment.java
+++ b/car-chassis-lib/src/com/android/car/ui/preference/EditTextPreferenceDialogFragment.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.chassis.preference;
+package com.android.car.ui.preference;
import android.app.AlertDialog;
import android.os.Bundle;
diff --git a/car-chassis-lib/src/com/android/car/chassis/preference/ListPreferenceDialogFragment.java b/car-chassis-lib/src/com/android/car/ui/preference/ListPreferenceDialogFragment.java
similarity index 98%
rename from car-chassis-lib/src/com/android/car/chassis/preference/ListPreferenceDialogFragment.java
rename to car-chassis-lib/src/com/android/car/ui/preference/ListPreferenceDialogFragment.java
index fb0b9b2..2d0a51d 100644
--- a/car-chassis-lib/src/com/android/car/chassis/preference/ListPreferenceDialogFragment.java
+++ b/car-chassis-lib/src/com/android/car/ui/preference/ListPreferenceDialogFragment.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.chassis.preference;
+package com.android.car.ui.preference;
import android.app.AlertDialog;
import android.content.DialogInterface;
diff --git a/car-chassis-lib/src/com/android/car/chassis/preference/MultiSelectListPreferenceDialogFragment.java b/car-chassis-lib/src/com/android/car/ui/preference/MultiSelectListPreferenceDialogFragment.java
similarity index 98%
rename from car-chassis-lib/src/com/android/car/chassis/preference/MultiSelectListPreferenceDialogFragment.java
rename to car-chassis-lib/src/com/android/car/ui/preference/MultiSelectListPreferenceDialogFragment.java
index 2c40e40..3a9fb7b 100644
--- a/car-chassis-lib/src/com/android/car/chassis/preference/MultiSelectListPreferenceDialogFragment.java
+++ b/car-chassis-lib/src/com/android/car/ui/preference/MultiSelectListPreferenceDialogFragment.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.chassis.preference;
+package com.android.car.ui.preference;
import android.app.AlertDialog;
import android.os.Bundle;
diff --git a/car-chassis-lib/src/com/android/car/chassis/preference/PreferenceDialogFragment.java b/car-chassis-lib/src/com/android/car/ui/preference/PreferenceDialogFragment.java
similarity index 99%
rename from car-chassis-lib/src/com/android/car/chassis/preference/PreferenceDialogFragment.java
rename to car-chassis-lib/src/com/android/car/ui/preference/PreferenceDialogFragment.java
index c1f9239..9e87838 100644
--- a/car-chassis-lib/src/com/android/car/chassis/preference/PreferenceDialogFragment.java
+++ b/car-chassis-lib/src/com/android/car/ui/preference/PreferenceDialogFragment.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.car.chassis.preference;
+package com.android.car.ui.preference;
import android.app.AlertDialog;
import android.app.Dialog;
diff --git a/car-chassis-lib/src/com/android/car/chassis/toolbar/MenuItem.java b/car-chassis-lib/src/com/android/car/ui/toolbar/MenuItem.java
similarity index 99%
rename from car-chassis-lib/src/com/android/car/chassis/toolbar/MenuItem.java
rename to car-chassis-lib/src/com/android/car/ui/toolbar/MenuItem.java
index 1776146..1a9cd40 100644
--- a/car-chassis-lib/src/com/android/car/chassis/toolbar/MenuItem.java
+++ b/car-chassis-lib/src/com/android/car/ui/toolbar/MenuItem.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.chassis.toolbar;
+package com.android.car.ui.toolbar;
import android.content.Context;
import android.graphics.drawable.Drawable;
@@ -24,7 +24,7 @@
import android.widget.ImageView;
import android.widget.Switch;
-import com.android.car.chassis.R;
+import com.android.car.ui.R;
/**
* Represents a button to display in the {@link Toolbar}.
diff --git a/car-chassis-lib/src/com/android/car/chassis/toolbar/SearchView.java b/car-chassis-lib/src/com/android/car/ui/toolbar/SearchView.java
similarity index 98%
rename from car-chassis-lib/src/com/android/car/chassis/toolbar/SearchView.java
rename to car-chassis-lib/src/com/android/car/ui/toolbar/SearchView.java
index be4f138..84bd985 100644
--- a/car-chassis-lib/src/com/android/car/chassis/toolbar/SearchView.java
+++ b/car-chassis-lib/src/com/android/car/ui/toolbar/SearchView.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.chassis.toolbar;
+package com.android.car.ui.toolbar;
import android.content.Context;
import android.graphics.Bitmap;
@@ -30,7 +30,7 @@
import androidx.constraintlayout.widget.ConstraintLayout;
-import com.android.car.chassis.R;
+import com.android.car.ui.R;
import java.util.HashSet;
import java.util.Set;
diff --git a/car-chassis-lib/src/com/android/car/chassis/toolbar/TabLayout.java b/car-chassis-lib/src/com/android/car/ui/toolbar/TabLayout.java
similarity index 99%
rename from car-chassis-lib/src/com/android/car/chassis/toolbar/TabLayout.java
rename to car-chassis-lib/src/com/android/car/ui/toolbar/TabLayout.java
index 005e598..ae77e76 100644
--- a/car-chassis-lib/src/com/android/car/chassis/toolbar/TabLayout.java
+++ b/car-chassis-lib/src/com/android/car/ui/toolbar/TabLayout.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.chassis.toolbar;
+package com.android.car.ui.toolbar;
import android.content.Context;
import android.graphics.Typeface;
@@ -34,7 +34,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
-import com.android.car.chassis.R;
+import com.android.car.ui.R;
import java.util.ArrayList;
import java.util.List;
diff --git a/car-chassis-lib/src/com/android/car/chassis/toolbar/Toolbar.java b/car-chassis-lib/src/com/android/car/ui/toolbar/Toolbar.java
similarity index 99%
rename from car-chassis-lib/src/com/android/car/chassis/toolbar/Toolbar.java
rename to car-chassis-lib/src/com/android/car/ui/toolbar/Toolbar.java
index 7158c71..ae5e1c4 100644
--- a/car-chassis-lib/src/com/android/car/chassis/toolbar/Toolbar.java
+++ b/car-chassis-lib/src/com/android/car/ui/toolbar/Toolbar.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.chassis.toolbar;
+package com.android.car.ui.toolbar;
import android.app.AlertDialog;
import android.content.Context;
@@ -33,7 +33,7 @@
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
-import com.android.car.chassis.R;
+import com.android.car.ui.R;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/car-chassis-lib/src/com/android/car/chassis/utils/ResourceUtils.java b/car-chassis-lib/src/com/android/car/ui/utils/ResourceUtils.java
similarity index 96%
rename from car-chassis-lib/src/com/android/car/chassis/utils/ResourceUtils.java
rename to car-chassis-lib/src/com/android/car/ui/utils/ResourceUtils.java
index 1ed0ae3..9835d69 100644
--- a/car-chassis-lib/src/com/android/car/chassis/utils/ResourceUtils.java
+++ b/car-chassis-lib/src/com/android/car/ui/utils/ResourceUtils.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.chassis.utils;
+package com.android.car.ui.utils;
import android.content.res.Resources;
import android.util.TypedValue;
diff --git a/car-chassis-lib/tests/paintbooth/AndroidManifest-gradle.xml b/car-chassis-lib/tests/paintbooth/AndroidManifest-gradle.xml
index 98bba2f..d812c74 100644
--- a/car-chassis-lib/tests/paintbooth/AndroidManifest-gradle.xml
+++ b/car-chassis-lib/tests/paintbooth/AndroidManifest-gradle.xml
@@ -16,7 +16,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.car.chassis.paintbooth">
+ package="com.android.car.ui.paintbooth">
<application
android:icon="@drawable/ic_launcher"
diff --git a/car-chassis-lib/tests/paintbooth/AndroidManifest.xml b/car-chassis-lib/tests/paintbooth/AndroidManifest.xml
index 007ba27..d9a8c4f 100644
--- a/car-chassis-lib/tests/paintbooth/AndroidManifest.xml
+++ b/car-chassis-lib/tests/paintbooth/AndroidManifest.xml
@@ -16,7 +16,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.car.chassis.paintbooth">
+ package="com.android.car.ui.paintbooth">
<uses-sdk
android:minSdkVersion="28"
diff --git a/car-chassis-lib/tests/paintbooth/res/layout/dialogs_activity.xml b/car-chassis-lib/tests/paintbooth/res/layout/dialogs_activity.xml
index acaaa8f..b8a6649 100644
--- a/car-chassis-lib/tests/paintbooth/res/layout/dialogs_activity.xml
+++ b/car-chassis-lib/tests/paintbooth/res/layout/dialogs_activity.xml
@@ -22,7 +22,7 @@
android:layout_height="match_parent"
android:background="@color/dialog_activity_background_color">
- <com.android.car.chassis.toolbar.Toolbar
+ <com.android.car.ui.toolbar.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/car-chassis-lib/tests/paintbooth/res/layout/main_activity.xml b/car-chassis-lib/tests/paintbooth/res/layout/main_activity.xml
index 68b1dcd..829dec2 100644
--- a/car-chassis-lib/tests/paintbooth/res/layout/main_activity.xml
+++ b/car-chassis-lib/tests/paintbooth/res/layout/main_activity.xml
@@ -22,7 +22,7 @@
android:layout_height="match_parent"
android:background="@color/dialog_activity_background_color">
- <com.android.car.chassis.toolbar.Toolbar
+ <com.android.car.ui.toolbar.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
app:title="@string/app_name"
app:logo="@drawable/ic_launcher"/>
- <com.android.car.chassis.pagedrecyclerview.PagedRecyclerView
+ <com.android.car.ui.pagedrecyclerview.PagedRecyclerView
android:id="@+id/activities"
android:layout_width="0dp"
android:layout_height="0dp"
diff --git a/car-chassis-lib/tests/paintbooth/src/com/android/car/chassis/paintbooth/DialogsActivity.java b/car-chassis-lib/tests/paintbooth/src/com/android/car/ui/paintbooth/DialogsActivity.java
similarity index 97%
rename from car-chassis-lib/tests/paintbooth/src/com/android/car/chassis/paintbooth/DialogsActivity.java
rename to car-chassis-lib/tests/paintbooth/src/com/android/car/ui/paintbooth/DialogsActivity.java
index e0ea589..8096e54 100644
--- a/car-chassis-lib/tests/paintbooth/src/com/android/car/chassis/paintbooth/DialogsActivity.java
+++ b/car-chassis-lib/tests/paintbooth/src/com/android/car/ui/paintbooth/DialogsActivity.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.chassis.paintbooth;
+package com.android.car.ui.paintbooth;
import android.app.Activity;
import android.app.AlertDialog;
@@ -22,7 +22,7 @@
import android.widget.TextView;
import android.widget.Toast;
-import com.android.car.chassis.toolbar.Toolbar;
+import com.android.car.ui.toolbar.Toolbar;
/**
* Activity that shows different dialogs from the device default theme.
diff --git a/car-chassis-lib/tests/paintbooth/src/com/android/car/chassis/paintbooth/MainActivity.java b/car-chassis-lib/tests/paintbooth/src/com/android/car/ui/paintbooth/MainActivity.java
similarity index 96%
rename from car-chassis-lib/tests/paintbooth/src/com/android/car/chassis/paintbooth/MainActivity.java
rename to car-chassis-lib/tests/paintbooth/src/com/android/car/ui/paintbooth/MainActivity.java
index 25be198..46f5836 100644
--- a/car-chassis-lib/tests/paintbooth/src/com/android/car/chassis/paintbooth/MainActivity.java
+++ b/car-chassis-lib/tests/paintbooth/src/com/android/car/ui/paintbooth/MainActivity.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.android.car.chassis.paintbooth;
+package com.android.car.ui.paintbooth;
import android.app.Activity;
import android.content.Intent;
@@ -27,7 +27,7 @@
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;
-import com.android.car.chassis.pagedrecyclerview.PagedRecyclerView;
+import com.android.car.ui.pagedrecyclerview.PagedRecyclerView;
import java.util.Arrays;
import java.util.List;
