Merge "Allow initial toolbar state to be set in XML" into pi-car-dev
diff --git a/car-chassis-lib/res/drawable/ic_arrow_back.xml b/car-chassis-lib/res/drawable/chassis_icon_arrow_back.xml
similarity index 100%
rename from car-chassis-lib/res/drawable/ic_arrow_back.xml
rename to car-chassis-lib/res/drawable/chassis_icon_arrow_back.xml
diff --git a/car-chassis-lib/res/drawable/ic_close.xml b/car-chassis-lib/res/drawable/chassis_icon_close.xml
similarity index 91%
rename from car-chassis-lib/res/drawable/ic_close.xml
rename to car-chassis-lib/res/drawable/chassis_icon_close.xml
index 48ab552..482df0f 100644
--- a/car-chassis-lib/res/drawable/ic_close.xml
+++ b/car-chassis-lib/res/drawable/chassis_icon_close.xml
@@ -17,8 +17,8 @@
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/primary_icon_size"
- android:height="@dimen/primary_icon_size"
+ android:width="24dp"
+ android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
diff --git a/car-chassis-lib/res/drawable/ic_search.xml b/car-chassis-lib/res/drawable/chassis_icon_search.xml
similarity index 92%
rename from car-chassis-lib/res/drawable/ic_search.xml
rename to car-chassis-lib/res/drawable/chassis_icon_search.xml
index 87e7d46..f70e61e 100644
--- a/car-chassis-lib/res/drawable/ic_search.xml
+++ b/car-chassis-lib/res/drawable/chassis_icon_search.xml
@@ -14,8 +14,8 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/primary_icon_size"
- android:height="@dimen/primary_icon_size"
+ android:width="48dp"
+ android:height="48dp"
android:viewportWidth="48"
android:viewportHeight="48">
diff --git a/car-chassis-lib/res/drawable/ic_settings.xml b/car-chassis-lib/res/drawable/chassis_icon_settings.xml
similarity index 94%
rename from car-chassis-lib/res/drawable/ic_settings.xml
rename to car-chassis-lib/res/drawable/chassis_icon_settings.xml
index 5c9e6a7..ebf8576 100644
--- a/car-chassis-lib/res/drawable/ic_settings.xml
+++ b/car-chassis-lib/res/drawable/chassis_icon_settings.xml
@@ -14,8 +14,8 @@
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="@dimen/primary_icon_size"
- android:height="@dimen/primary_icon_size"
+ android:width="24dp"
+ android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
diff --git a/car-chassis-lib/res/drawable/chassis_toolbar_button_background.xml b/car-chassis-lib/res/drawable/chassis_toolbar_button_background.xml
index 7d29d64..efa63b9 100644
--- a/car-chassis-lib/res/drawable/chassis_toolbar_button_background.xml
+++ b/car-chassis-lib/res/drawable/chassis_toolbar_button_background.xml
@@ -17,5 +17,5 @@
~
-->
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
- android:color="@*android:color/car_card_ripple_background"
+ android:color="@color/chassis_card_ripple_background"
android:radius="@dimen/chassis_toolbar_button_background_radius"/>
diff --git a/car-chassis-lib/res/layout/chassis_search_view.xml b/car-chassis-lib/res/layout/chassis_search_view.xml
index e9942a7..7decb3a 100644
--- a/car-chassis-lib/res/layout/chassis_search_view.xml
+++ b/car-chassis-lib/res/layout/chassis_search_view.xml
@@ -21,9 +21,9 @@
<ImageView
android:id="@+id/icon"
- android:layout_width="@dimen/touch_target_size"
- android:layout_height="@dimen/touch_target_size"
- android:src="@drawable/ic_search"
+ android:layout_width="@dimen/chassis_touch_target_width"
+ android:layout_height="@dimen/chassis_touch_target_height"
+ android:src="@drawable/chassis_icon_search"
android:scaleType="center"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
@@ -33,9 +33,9 @@
android:id="@+id/search_bar"
android:layout_height="match_parent"
android:layout_width="match_parent"
- android:paddingLeft="@dimen/touch_target_size"
- android:hint="@string/chassis_default_search_hint"
- android:textColorHint="@color/search_hint_text_color"
+ android:paddingLeft="@dimen/chassis_touch_target_width"
+ android:hint="@string/chassis_toolbar_default_search_hint"
+ android:textColorHint="@color/chassis_toolbar_search_hint_text_color"
android:inputType="text"
android:singleLine="true"
android:imeOptions="actionDone"
@@ -46,10 +46,10 @@
<ImageView
android:id="@+id/search_close"
- android:layout_width="@dimen/touch_target_size"
- android:layout_height="@dimen/touch_target_size"
+ android:layout_width="@dimen/chassis_touch_target_width"
+ android:layout_height="@dimen/chassis_touch_target_height"
android:background="@drawable/chassis_toolbar_button_background"
- android:src="@drawable/ic_close"
+ android:src="@drawable/chassis_icon_close"
android:scaleType="center"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/car-chassis-lib/res/layout/chassis_toolbar_search_button.xml b/car-chassis-lib/res/layout/chassis_toolbar_search_button.xml
index 91afe95..e42e4ce 100644
--- a/car-chassis-lib/res/layout/chassis_toolbar_search_button.xml
+++ b/car-chassis-lib/res/layout/chassis_toolbar_search_button.xml
@@ -17,8 +17,8 @@
<ImageView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/search"
- android:layout_width="@dimen/touch_target_size"
- android:layout_height="@dimen/touch_target_size"
- android:src="@drawable/ic_search"
+ android:layout_width="@dimen/chassis_touch_target_width"
+ android:layout_height="@dimen/chassis_touch_target_height"
+ android:src="@drawable/chassis_icon_search"
android:scaleType="center"
android:background="@drawable/chassis_toolbar_button_background"/>
diff --git a/car-chassis-lib/res/layout/chassis_toolbar_settings_button.xml b/car-chassis-lib/res/layout/chassis_toolbar_settings_button.xml
index c295d5c..f044099 100644
--- a/car-chassis-lib/res/layout/chassis_toolbar_settings_button.xml
+++ b/car-chassis-lib/res/layout/chassis_toolbar_settings_button.xml
@@ -17,8 +17,8 @@
<ImageView
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/settings"
- android:layout_width="@dimen/touch_target_size"
- android:layout_height="@dimen/touch_target_size"
- android:src="@drawable/ic_settings"
+ android:layout_width="@dimen/chassis_touch_target_width"
+ android:layout_height="@dimen/chassis_touch_target_height"
+ android:src="@drawable/chassis_icon_settings"
android:scaleType="center"
android:background="@drawable/chassis_toolbar_button_background"/>
diff --git a/car-chassis-lib/res/values-night/colors.xml b/car-chassis-lib/res/values-night/colors.xml
index 0ee4613..6e0aebe 100644
--- a/car-chassis-lib/res/values-night/colors.xml
+++ b/car-chassis-lib/res/values-night/colors.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<!-- Copyright (C) 2015 The Android Open Source Project
+<!-- Copyright (C) 2019 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -14,6 +14,12 @@
limitations under the License.
-->
<resources>
- <color name="chassis_tab_selected_color">@color/chassis_tab_selected_color_dark</color>
- <color name="chassis_tab_unselected_color">@color/chassis_tab_unselected_color_dark</color>
+ <!-- General -->
+
+ <!-- Main text color (titles, text body, etc.) -->
+ <color name="chassis_primary_text_color">#E2FFFFFF</color>
+ <!-- Text color used in subtitles or other secondary text blocks -->
+ <color name="chassis_secondary_text_color">#80FFFFFF</color>
+ <!-- The ripple color for a card. -->
+ <color name="chassis_card_ripple_background">#8F000000</color>
</resources>
diff --git a/car-chassis-lib/res/values-port/dimens.xml b/car-chassis-lib/res/values-port/dimens.xml
index d91a195..543e63b 100644
--- a/car-chassis-lib/res/values-port/dimens.xml
+++ b/car-chassis-lib/res/values-port/dimens.xml
@@ -15,5 +15,5 @@
limitations under the License.
-->
<resources>
- <dimen name="chassis_toolbar_second_row_height">@*android:dimen/car_app_bar_height</dimen>
+ <dimen name="chassis_toolbar_second_row_height">@dimen/chassis_app_bar_height</dimen>
</resources>
diff --git a/car-chassis-lib/res/values-w1280dp/dimens.xml b/car-chassis-lib/res/values-w1280dp/dimens.xml
new file mode 100644
index 0000000..2794db3
--- /dev/null
+++ b/car-chassis-lib/res/values-w1280dp/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+ <!-- Margin -->
+ <dimen name="chassis_margin">148dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/car-chassis-lib/res/values-w1920dp/dimens.xml b/car-chassis-lib/res/values-w1920dp/dimens.xml
new file mode 100644
index 0000000..dc68fdf
--- /dev/null
+++ b/car-chassis-lib/res/values-w1920dp/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+ <!-- Margin -->
+ <dimen name="chassis_margin">192dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/car-chassis-lib/res/values-w690dp/dimens.xml b/car-chassis-lib/res/values-w690dp/dimens.xml
new file mode 100644
index 0000000..dbfb227
--- /dev/null
+++ b/car-chassis-lib/res/values-w690dp/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2019 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+<resources>
+ <!-- Margin -->
+ <dimen name="chassis_margin">112dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/car-chassis-lib/res/values/colors.xml b/car-chassis-lib/res/values/colors.xml
index 7c06fa2..bfd44f0 100644
--- a/car-chassis-lib/res/values/colors.xml
+++ b/car-chassis-lib/res/values/colors.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<!-- Copyright (C) 2015 The Android Open Source Project
+<!-- Copyright (C) 2019 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -14,16 +14,26 @@
limitations under the License.
-->
<resources>
- <color name="primary_text_color">#FFFFFFFF</color>
- <color name="secondary_text_color">#90FFFFFF</color>
- <color name="search_hint_text_color">#33FFFFFF</color>
+ <!-- General -->
- <color name="toolbar_background_color">#E0000000</color>
+ <!-- Main text color (titles, text body, etc.) -->
+ <color name="chassis_primary_text_color">#FFFFFFFF</color>
+ <!-- Text color used in subtitles or other secondary text blocks -->
+ <color name="chassis_secondary_text_color">#90FFFFFF</color>
+ <!-- The ripple color for a card. -->
+ <color name="chassis_card_ripple_background">#27ffffff</color>
- <color name="chassis_tab_selected_color">@color/chassis_tab_selected_color_light</color>
- <color name="chassis_tab_selected_color_dark">#E2FFFFFF</color>
- <color name="chassis_tab_selected_color_light">#FFFFFFFF</color>
- <color name="chassis_tab_unselected_color">@color/chassis_tab_unselected_color_light</color>
- <color name="chassis_tab_unselected_color_dark">#80FFFFFF</color>
- <color name="chassis_tab_unselected_color_light">#90FFFFFF</color>
+ <!-- Tabs -->
+
+ <!-- Selected colors -->
+ <color name="chassis_tab_selected_color">@color/chassis_primary_text_color</color>
+ <!-- Normal colors -->
+ <color name="chassis_tab_unselected_color">@color/chassis_secondary_text_color</color>
+
+ <!-- Toolbar -->
+
+ <!-- Text color applied to the hint displayed inside the search box -->
+ <color name="chassis_toolbar_search_hint_text_color">#33FFFFFF</color>
+ <!-- Toolbar background color -->
+ <color name="chassis_toolbar_background_color">#E0000000</color>
</resources>
diff --git a/car-chassis-lib/res/values/dimens.xml b/car-chassis-lib/res/values/dimens.xml
index 6bc61dd..0226617 100644
--- a/car-chassis-lib/res/values/dimens.xml
+++ b/car-chassis-lib/res/values/dimens.xml
@@ -14,22 +14,49 @@
limitations under the License.
-->
<resources>
- <dimen name="touch_target_size">@*android:dimen/car_touch_target_size</dimen>
- <dimen name="primary_icon_size">@*android:dimen/car_primary_icon_size</dimen>
- <item name="letter_spacing_body1" format="float" type="dimen">0.0</item>
- <item name="letter_spacing_body3" format="float" type="dimen">0.0</item>
+ <!-- General resources -->
+
+ <dimen name="chassis_touch_target_width">76dp</dimen>
+ <dimen name="chassis_touch_target_height">76dp</dimen>
+ <dimen name="chassis_primary_icon_size">44dp</dimen>
+ <item name="chassis_letter_spacing_body1" format="float" type="dimen">0.0</item>
+ <item name="chassis_letter_spacing_body3" format="float" type="dimen">0.0</item>
+
+ <!-- Application Bar -->
+ <dimen name="chassis_app_bar_height">80dp</dimen>
+
+ <!-- Margin -->
+ <dimen name="chassis_margin">20dp</dimen>
+
+ <!-- Paddings -->
+ <dimen name="chassis_padding_0">4dp</dimen>
+ <dimen name="chassis_padding_1">8dp</dimen>
+ <dimen name="chassis_padding_2">16dp</dimen>
+ <dimen name="chassis_padding_3">24dp</dimen>
+ <dimen name="chassis_padding_4">32dp</dimen>
+ <dimen name="chassis_padding_5">64dp</dimen>
+ <dimen name="chassis_padding_6">96dp</dimen>
<!-- Tabs -->
- <dimen name="chassis_tab_width">135dp</dimen>
+
+ <!-- Exact size of the tab textbox. Use @dimen/wrap_content if this must be flexible -->
+ <dimen name="chassis_tab_text_width">135dp</dimen>
+ <!-- Horizontal padding between tabs -->
<dimen name="chassis_tab_padding_x">12dp</dimen>
- <dimen name="chassis_tab_icon_size">36dp</dimen>
+ <!-- Tab icon width (if icons are enabled) -->
+ <dimen name="chassis_tab_icon_width">36dp</dimen>
+ <!-- Tab icon height (if icons are enabled) -->
+ <dimen name="chassis_tab_icon_height">36dp</dimen>
<!-- Car toolbar -->
- <dimen name="chassis_toolbar_view_nav_button_width">@*android:dimen/car_margin</dimen>
- <dimen name="chassis_toolbar_first_row_height">@*android:dimen/car_app_bar_height</dimen>
+ <dimen name="chassis_toolbar_view_nav_button_width">@dimen/chassis_margin</dimen>
+ <dimen name="chassis_toolbar_first_row_height">@dimen/chassis_app_bar_height</dimen>
<dimen name="chassis_toolbar_second_row_height">0dp</dimen>
- <dimen name="chassis_toolbar_view_icon_size">@*android:dimen/car_primary_icon_size</dimen>
- <dimen name="chassis_toolbar_view_title_margin_start">@*android:dimen/car_padding_2</dimen>
- <dimen name="chassis_toolbar_custom_button_margin">@*android:dimen/car_padding_2</dimen>
+ <dimen name="chassis_toolbar_view_icon_size">@dimen/chassis_primary_icon_size</dimen>
+ <dimen name="chassis_toolbar_view_title_margin_start">@dimen/chassis_padding_2</dimen>
+ <dimen name="chassis_toolbar_custom_button_margin">@dimen/chassis_padding_2</dimen>
<dimen name="chassis_toolbar_button_background_radius">48dp</dimen>
+
+ <!-- Internal artifacts. Do not overlay -->
+ <item name="wrap_content" format="integer" type="dimen">-2</item>
</resources>
diff --git a/car-chassis-lib/res/values/strings.xml b/car-chassis-lib/res/values/strings.xml
index b93e4a1..b5cf087 100644
--- a/car-chassis-lib/res/values/strings.xml
+++ b/car-chassis-lib/res/values/strings.xml
@@ -15,5 +15,5 @@
-->
<resources>
<!-- Search hint, displayed inside the search box [CHAR LIMIT=50] -->
- <string name="chassis_default_search_hint">Search…</string>
+ <string name="chassis_toolbar_default_search_hint">Search…</string>
</resources>
diff --git a/car-chassis-lib/res/values/styles.xml b/car-chassis-lib/res/values/styles.xml
index 5214d2d..2ba1a4c 100644
--- a/car-chassis-lib/res/values/styles.xml
+++ b/car-chassis-lib/res/values/styles.xml
@@ -19,18 +19,17 @@
<style name="ChassisTabItemText">
<item name="android:textAppearance">@style/TextAppearance.Body3</item>
<item name="android:textColor">@color/chassis_tab_item_selector</item>
- <item name="android:layout_width">@dimen/chassis_tab_width</item>
+ <item name="android:layout_width">@dimen/chassis_tab_text_width</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:singleLine">true</item>
<item name="android:gravity">center</item>
</style>
<style name="ChassisTabItemIcon">
- <item name="android:layout_width">@dimen/chassis_tab_icon_size</item>
- <item name="android:layout_height">@dimen/chassis_tab_icon_size</item>
+ <item name="android:layout_width">@dimen/chassis_tab_icon_width</item>
+ <item name="android:layout_height">@dimen/chassis_tab_icon_height</item>
<item name="android:scaleType">fitCenter</item>
<item name="android:tint">@color/chassis_tab_item_selector</item>
- <item name="android:tintMode">src_in</item>
</style>
<style name="ChassisTabItemBackground">
@@ -67,7 +66,8 @@
<item name="android:layout_width">@dimen/chassis_toolbar_view_icon_size</item>
<item name="android:layout_height">@dimen/chassis_toolbar_view_icon_size</item>
<item name="android:layout_gravity">center</item>
- <item name="android:src">@drawable/ic_arrow_back</item>
+ <item name="android:tint">@color/chassis_primary_text_color</item>
+ <item name="android:src">@drawable/chassis_icon_arrow_back</item>
<item name="android:scaleType">fitXY</item>
</style>
@@ -80,17 +80,17 @@
<style name="TextAppearance">
<item name="android:fontFamily">roboto-regular</item>
- <item name="android:textColor">@color/primary_text_color</item>
+ <item name="android:textColor">@color/chassis_primary_text_color</item>
</style>
<style name="TextAppearance.Body1" parent="TextAppearance">
<item name="android:textSize">32sp</item>
- <item name="android:letterSpacing">@dimen/letter_spacing_body1</item>
+ <item name="android:letterSpacing">@dimen/chassis_letter_spacing_body1</item>
</style>
<style name="TextAppearance.Body3" parent="TextAppearance">
<item name="android:textSize">24sp</item>
- <item name="android:letterSpacing">@dimen/letter_spacing_body3</item>
+ <item name="android:letterSpacing">@dimen/chassis_letter_spacing_body3</item>
</style>
</resources>
diff --git a/car-chassis-lib/res/values/themes.xml b/car-chassis-lib/res/values/themes.xml
new file mode 100644
index 0000000..70ea7ae
--- /dev/null
+++ b/car-chassis-lib/res/values/themes.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+ <!-- Base application theme. -->
+ <style name="ChassisTheme" parent="android:Theme.DeviceDefault">
+ <item name="android:windowActionBar">false</item>
+ <item name="android:windowNoTitle">true</item>
+ </style>
+</resources>
\ No newline at end of file
diff --git a/car-chassis-lib/src/com/android/car/chassis/Toolbar.java b/car-chassis-lib/src/com/android/car/chassis/Toolbar.java
index b50b913..ae51e92 100644
--- a/car-chassis-lib/src/com/android/car/chassis/Toolbar.java
+++ b/car-chassis-lib/src/com/android/car/chassis/Toolbar.java
@@ -130,7 +130,7 @@
mTitle.setText(a.getString(R.styleable.ChassisToolbar_title));
setLogo(a.getResourceId(R.styleable.ChassisToolbar_logo, 0));
setButtons(a.getResourceId(R.styleable.ChassisToolbar_buttons, 0));
- setBackground(context.getDrawable(R.color.toolbar_background_color));
+ setBackground(context.getDrawable(R.color.chassis_toolbar_background_color));
mShowButtonsWhileSearching = a.getBoolean(
R.styleable.ChassisToolbar_showButtonsWhileSearching, false);
String searchHint = a.getString(R.styleable.ChassisToolbar_searchHint);
@@ -359,7 +359,7 @@
View.OnClickListener backClickListener = (v) -> forEachListener(Listener::onBack);
mNavIcon.setVisibility(state != State.HOME ? VISIBLE : INVISIBLE);
- mNavIcon.setImageResource(state != State.HOME ? R.drawable.ic_arrow_back : 0);
+ mNavIcon.setImageResource(state != State.HOME ? R.drawable.chassis_icon_arrow_back : 0);
mLogo.setVisibility(state == State.HOME && mHasLogo ? VISIBLE : INVISIBLE);
mNavIconContainer.setVisibility(state != State.HOME || mHasLogo ? VISIBLE : GONE);
mNavIconContainer.setClickable(state != State.HOME);
diff --git a/car-chassis-lib/tests/paintbooth/AndroidManifest-gradle.xml b/car-chassis-lib/tests/paintbooth/AndroidManifest-gradle.xml
index 78a743c..a44ea36 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/android:Theme.DeviceDefault">
+ android:theme="@style/ChassisTheme">
<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 68ff9e2..097cf7e 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/android:Theme.DeviceDefault">
+ android:theme="@style/ChassisTheme">
<activity
android:name=".MainActivity"
android:exported="true">
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 804361d..29712a9 100644
--- a/car-chassis-lib/tests/paintbooth/res/layout/dialog_samples.xml
+++ b/car-chassis-lib/tests/paintbooth/res/layout/dialog_samples.xml
@@ -24,10 +24,10 @@
<com.android.car.chassis.Toolbar
android:id="@+id/toolbar"
- android:layout_width="500dp"
- android:layout_height="200dp"
- android:background="#FF0000"
- app:layout_constraintTop_toBottomOf="parent"/>
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent"
+ app:title="@string/app_name"/>
<Button
android:id="@+id/show_dialog_bt"
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 1879178..5b883ec 100644
--- a/car-chassis-lib/tests/paintbooth/res/layout/home_page.xml
+++ b/car-chassis-lib/tests/paintbooth/res/layout/home_page.xml
@@ -22,6 +22,14 @@
android:layout_height="match_parent"
android:background="@color/dialog_activity_background_color">
+ <com.android.car.chassis.Toolbar
+ android:id="@+id/toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent"
+ app:title="@string/app_name"
+ app:logo="@drawable/ic_launcher"/>
+
<Button
android:id="@+id/dialog_samples"
android:layout_width="wrap_content"
@@ -29,6 +37,6 @@
android:text="Show Dialog Sample Page"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
- app:layout_constraintTop_toTopOf="parent"/>
+ app:layout_constraintTop_toBottomOf="@id/toolbar"/>
</androidx.constraintlayout.widget.ConstraintLayout>
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 8c350df..693dbd9 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,6 +22,8 @@
import android.widget.TextView;
import android.widget.Toast;
+import com.android.car.chassis.Toolbar;
+
/**
* Activity that shows different dialogs from the device default theme.
*/
@@ -42,6 +44,14 @@
showDialogWithCheckboxButton.setOnClickListener(v -> openDialog(true));
Button showToast = findViewById(R.id.show_toast);
showToast.setOnClickListener(v -> showToast());
+ Toolbar toolbar = findViewById(R.id.toolbar);
+ toolbar.setState(Toolbar.State.SUBPAGE);
+ toolbar.addListener(new Toolbar.Listener() {
+ @Override
+ public void onBack() {
+ finish();
+ }
+ });
}
private void openDialog(boolean showCheckbox) {