Move toolbar classes to their own package
Test: Manually
Change-Id: Ie97c34d636d4ca0da948e98b1d3f65d1a5775537
diff --git a/car-chassis-lib/res/layout-port/chassis_toolbar.xml b/car-chassis-lib/res/layout-port/chassis_toolbar.xml
index 327abe9..b69ebd1 100644
--- a/car-chassis-lib/res/layout-port/chassis_toolbar.xml
+++ b/car-chassis-lib/res/layout-port/chassis_toolbar.xml
@@ -59,7 +59,7 @@
app:layout_constraintStart_toEndOf="@id/nav_icon_container"
app:layout_constraintEnd_toStartOf="@id/menu_items_container"/>
- <com.android.car.chassis.SearchView
+ <com.android.car.chassis.toolbar.SearchView
android:id="@+id/search_view"
android:layout_width="0dp"
android:layout_height="match_parent"
@@ -108,7 +108,7 @@
android:tintMode="src_in"/>
</FrameLayout>
- <com.android.car.chassis.TabLayout
+ <com.android.car.chassis.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 8a5b6bc..d5baa20 100644
--- a/car-chassis-lib/res/layout/chassis_toolbar.xml
+++ b/car-chassis-lib/res/layout/chassis_toolbar.xml
@@ -45,7 +45,7 @@
app:layout_constraintStart_toEndOf="@+id/nav_icon_container"
app:layout_constraintEnd_toStartOf="@+id/menu_items_container"/>
- <com.android.car.chassis.TabLayout
+ <com.android.car.chassis.toolbar.TabLayout
android:id="@+id/tabs"
android:layout_width="wrap_content"
android:layout_height="0dp"
@@ -95,7 +95,7 @@
android:tintMode="src_in"/>
</FrameLayout>
- <com.android.car.chassis.SearchView
+ <com.android.car.chassis.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/MenuItem.java b/car-chassis-lib/src/com/android/car/chassis/toolbar/MenuItem.java
similarity index 99%
rename from car-chassis-lib/src/com/android/car/chassis/MenuItem.java
rename to car-chassis-lib/src/com/android/car/chassis/toolbar/MenuItem.java
index 79cff4a..1776146 100644
--- a/car-chassis-lib/src/com/android/car/chassis/MenuItem.java
+++ b/car-chassis-lib/src/com/android/car/chassis/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;
+package com.android.car.chassis.toolbar;
import android.content.Context;
import android.graphics.drawable.Drawable;
@@ -24,6 +24,8 @@
import android.widget.ImageView;
import android.widget.Switch;
+import com.android.car.chassis.R;
+
/**
* Represents a button to display in the {@link Toolbar}.
*
diff --git a/car-chassis-lib/src/com/android/car/chassis/SearchView.java b/car-chassis-lib/src/com/android/car/chassis/toolbar/SearchView.java
similarity index 98%
rename from car-chassis-lib/src/com/android/car/chassis/SearchView.java
rename to car-chassis-lib/src/com/android/car/chassis/toolbar/SearchView.java
index d63d33e..be4f138 100644
--- a/car-chassis-lib/src/com/android/car/chassis/SearchView.java
+++ b/car-chassis-lib/src/com/android/car/chassis/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;
+package com.android.car.chassis.toolbar;
import android.content.Context;
import android.graphics.Bitmap;
@@ -30,6 +30,8 @@
import androidx.constraintlayout.widget.ConstraintLayout;
+import com.android.car.chassis.R;
+
import java.util.HashSet;
import java.util.Set;
diff --git a/car-chassis-lib/src/com/android/car/chassis/TabLayout.java b/car-chassis-lib/src/com/android/car/chassis/toolbar/TabLayout.java
similarity index 99%
rename from car-chassis-lib/src/com/android/car/chassis/TabLayout.java
rename to car-chassis-lib/src/com/android/car/chassis/toolbar/TabLayout.java
index 490baa5..24ec5d7 100644
--- a/car-chassis-lib/src/com/android/car/chassis/TabLayout.java
+++ b/car-chassis-lib/src/com/android/car/chassis/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;
+package com.android.car.chassis.toolbar;
import android.content.Context;
import android.content.res.TypedArray;
@@ -34,6 +34,8 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import com.android.car.chassis.R;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
diff --git a/car-chassis-lib/src/com/android/car/chassis/Toolbar.java b/car-chassis-lib/src/com/android/car/chassis/toolbar/Toolbar.java
similarity index 99%
rename from car-chassis-lib/src/com/android/car/chassis/Toolbar.java
rename to car-chassis-lib/src/com/android/car/chassis/toolbar/Toolbar.java
index 09f8bdd..7158c71 100644
--- a/car-chassis-lib/src/com/android/car/chassis/Toolbar.java
+++ b/car-chassis-lib/src/com/android/car/chassis/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;
+package com.android.car.chassis.toolbar;
import android.app.AlertDialog;
import android.content.Context;
@@ -33,6 +33,8 @@
import androidx.annotation.Nullable;
import androidx.annotation.StringRes;
+import com.android.car.chassis.R;
+
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
diff --git a/car-chassis-lib/tests/paintbooth/res/layout/dialog_samples.xml b/car-chassis-lib/tests/paintbooth/res/layout/dialog_samples.xml
index 29712a9..acaaa8f 100644
--- a/car-chassis-lib/tests/paintbooth/res/layout/dialog_samples.xml
+++ b/car-chassis-lib/tests/paintbooth/res/layout/dialog_samples.xml
@@ -22,7 +22,7 @@
android:layout_height="match_parent"
android:background="@color/dialog_activity_background_color">
- <com.android.car.chassis.Toolbar
+ <com.android.car.chassis.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/home_page.xml b/car-chassis-lib/tests/paintbooth/res/layout/home_page.xml
index 5b883ec..0384e4f 100644
--- a/car-chassis-lib/tests/paintbooth/res/layout/home_page.xml
+++ b/car-chassis-lib/tests/paintbooth/res/layout/home_page.xml
@@ -22,7 +22,7 @@
android:layout_height="match_parent"
android:background="@color/dialog_activity_background_color">
- <com.android.car.chassis.Toolbar
+ <com.android.car.chassis.toolbar.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
diff --git a/car-chassis-lib/tests/paintbooth/src/com/android/car/chassis/paintbooth/DialogSamples.java b/car-chassis-lib/tests/paintbooth/src/com/android/car/chassis/paintbooth/DialogSamples.java
index 693dbd9..41a2718 100644
--- a/car-chassis-lib/tests/paintbooth/src/com/android/car/chassis/paintbooth/DialogSamples.java
+++ b/car-chassis-lib/tests/paintbooth/src/com/android/car/chassis/paintbooth/DialogSamples.java
@@ -22,7 +22,7 @@
import android.widget.TextView;
import android.widget.Toast;
-import com.android.car.chassis.Toolbar;
+import com.android.car.chassis.toolbar.Toolbar;
/**
* Activity that shows different dialogs from the device default theme.