Merge "DO NOT MERGE Refactor of the RRO structure" into sc-v2-dev
diff --git a/car_product/car_ui_portrait/Android.mk b/car_product/car_ui_portrait/Android.mk
index 2345d92..53ad94b 100644
--- a/car_product/car_ui_portrait/Android.mk
+++ b/car_product/car_ui_portrait/Android.mk
@@ -14,8 +14,8 @@
#
car_ui_portrait_modules := \
- rro/alert-dialog-customizations \
rro/car-ui-customizations \
+ rro/car-ui-toolbar-customizations \
apps/HideApps
include $(call all-named-subdir-makefiles,$(car_ui_portrait_modules))
diff --git a/car_product/car_ui_portrait/rro/alert-dialog-customizations/Android.mk b/car_product/car_ui_portrait/rro/alert-dialog-customizations/Android.mk
deleted file mode 100644
index 7ae49f5..0000000
--- a/car_product/car_ui_portrait/rro/alert-dialog-customizations/Android.mk
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2021 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.
-#
-
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-CAR_UI_RRO_SET_NAME := generated_caruiportrait_alertdialog
-CAR_UI_RRO_MANIFEST_FILE := $(LOCAL_PATH)/AndroidManifest.xml
-CAR_UI_RESOURCE_DIR := $(LOCAL_PATH)/res
-CAR_UI_RRO_TARGETS := \
- com.android.car.ui.paintbooth \
- com.google.android.car.ui.paintbooth \
- com.google.android.carui.ats \
- com.android.car.rotaryplayground \
- com.android.car.themeplayground \
- com.android.car.carlauncher \
- com.android.car.home \
- com.android.car.media \
- com.android.car.radio \
- com.android.car.calendar \
- com.android.car.companiondevicesupport \
- com.android.car.systemupdater \
- com.android.car.dialer \
- com.android.car.linkviewer \
- com.android.car.settings \
- com.android.car.voicecontrol \
- com.android.car.faceenroll \
- com.android.car.developeroptions \
- com.android.managedprovisioning \
- com.android.settings.intelligence \
- com.google.android.apps.automotive.inputmethod \
- com.google.android.apps.automotive.inputmethod.dev \
- com.google.android.apps.automotive.templates.host \
- com.google.android.embedded.projection \
- com.google.android.gms \
- com.google.android.gsf \
- com.google.android.packageinstaller \
- com.google.android.permissioncontroller \
- com.google.android.carassistant \
- com.google.android.tts \
- com.android.htmlviewer \
- com.android.vending \
-
-include packages/apps/Car/libs/car-ui-lib/generate_rros.mk
diff --git a/car_product/car_ui_portrait/rro/alert-dialog-customizations/product.mk b/car_product/car_ui_portrait/rro/alert-dialog-customizations/product.mk
deleted file mode 100644
index 8a3a73c..0000000
--- a/car_product/car_ui_portrait/rro/alert-dialog-customizations/product.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2021 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.
-#
-
-# Inherit from this product to include the "Car Ui Portrait" RROs for CarUi
-# Include generated RROs
-PRODUCT_PACKAGES += \
- generated_caruiportrait_alertdialog-com-android-car-ui-paintbooth \
- generated_caruiportrait_alertdialog-com-google-android-car-ui-paintbooth \
- generated_caruiportrait_alertdialog-com-google-android-carui-ats \
- generated_caruiportrait_alertdialog-com-android-car-rotaryplayground \
- generated_caruiportrait_alertdialog-com-android-car-themeplayground \
- generated_caruiportrait_alertdialog-com-android-car-carlauncher \
- generated_caruiportrait_alertdialog-com-android-car-home \
- generated_caruiportrait_alertdialog-com-android-car-media \
- generated_caruiportrait_alertdialog-com-android-car-radio \
- generated_caruiportrait_alertdialog-com-android-car-calendar \
- generated_caruiportrait_alertdialog-com-android-car-companiondevicesupport \
- generated_caruiportrait_alertdialog-com-android-car-systemupdater \
- generated_caruiportrait_alertdialog-com-android-car-dialer \
- generated_caruiportrait_alertdialog-com-android-car-linkviewer \
- generated_caruiportrait_alertdialog-com-android-car-settings \
- generated_caruiportrait_alertdialog-com-android-car-voicecontrol \
- generated_caruiportrait_alertdialog-com-android-car-faceenroll \
- generated_caruiportrait_alertdialog-com-android-car-developeroptions \
- generated_caruiportrait_alertdialog-com-android-managedprovisioning \
- generated_caruiportrait_alertdialog-com-android-settings-intelligence \
- generated_caruiportrait_alertdialog-com-google-android-apps-automotive-inputmethod \
- generated_caruiportrait_alertdialog-com-google-android-apps-automotive-inputmethod-dev \
- generated_caruiportrait_alertdialog-com-google-android-apps-automotive-templates-host \
- generated_caruiportrait_alertdialog-com-google-android-embedded-projection \
- generated_caruiportrait_alertdialog-com-google-android-gms \
- generated_caruiportrait_alertdialog-com-google-android-gsf \
- generated_caruiportrait_alertdialog-com-google-android-packageinstaller \
- generated_caruiportrait_alertdialog-com-google-android-permissioncontroller \
- generated_caruiportrait_alertdialog-com-google-android-carassistant \
- generated_caruiportrait_alertdialog-com-google-android-tts \
- generated_caruiportrait_alertdialog-com-android-htmlviewer \
- generated_caruiportrait_alertdialog-com-android-vending \
\ No newline at end of file
diff --git a/car_product/car_ui_portrait/rro/alert-dialog-customizations/res/xml/overlays.xml b/car_product/car_ui_portrait/rro/alert-dialog-customizations/res/xml/overlays.xml
deleted file mode 100644
index 46bf533..0000000
--- a/car_product/car_ui_portrait/rro/alert-dialog-customizations/res/xml/overlays.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright (C) 2021 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.
- -->
-<overlay>
- <item target="layout/car_ui_alert_dialog_title_with_subtitle" value="@layout/car_ui_alert_dialog_title_with_subtitle"/>
-
- <item target="id/car_ui_alert_icon" value="@id/car_ui_alert_icon"/>
- <item target="id/car_ui_alert_title" value="@id/car_ui_alert_title"/>
- <item target="id/car_ui_alert_subtitle" value="@id/car_ui_alert_subtitle"/>
-
- <item target="dimen/car_ui_body1_size" value="@dimen/car_ui_body1_size"/>
- <item target="dimen/car_ui_body3_size" value="@dimen/car_ui_body3_size"/>
-</overlay>
diff --git a/car_product/car_ui_portrait/rro/car-ui-customizations/Android.mk b/car_product/car_ui_portrait/rro/car-ui-customizations/Android.mk
index a8e3b25..96c6d30 100644
--- a/car_product/car_ui_portrait/rro/car-ui-customizations/Android.mk
+++ b/car_product/car_ui_portrait/rro/car-ui-customizations/Android.mk
@@ -17,11 +17,41 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
-CAR_UI_RRO_SET_NAME := generatedcaruiportrait
+CAR_UI_RRO_SET_NAME := generated_caruiportrait_customization
CAR_UI_RRO_MANIFEST_FILE := $(LOCAL_PATH)/AndroidManifest.xml
CAR_UI_RESOURCE_DIR := $(LOCAL_PATH)/res
CAR_UI_RRO_TARGETS := \
+ com.android.car.ui.paintbooth \
+ com.google.android.car.ui.paintbooth \
+ com.google.android.carui.ats \
+ com.android.car.rotaryplayground \
+ com.android.car.themeplayground \
+ com.android.car.carlauncher \
+ com.android.car.home \
com.android.car.media \
+ com.android.car.radio \
+ com.android.car.calendar \
+ com.android.car.companiondevicesupport \
+ com.android.car.systemupdater \
com.android.car.dialer \
+ com.android.car.linkviewer \
+ com.android.car.settings \
+ com.android.car.voicecontrol \
+ com.android.car.faceenroll \
+ com.android.car.developeroptions \
+ com.android.managedprovisioning \
+ com.android.settings.intelligence \
+ com.google.android.apps.automotive.inputmethod \
+ com.google.android.apps.automotive.inputmethod.dev \
+ com.google.android.apps.automotive.templates.host \
+ com.google.android.embedded.projection \
+ com.google.android.gms \
+ com.google.android.gsf \
+ com.google.android.packageinstaller \
+ com.google.android.permissioncontroller \
+ com.google.android.carassistant \
+ com.google.android.tts \
+ com.android.htmlviewer \
+ com.android.vending \
include packages/apps/Car/libs/car-ui-lib/generate_rros.mk
diff --git a/car_product/car_ui_portrait/rro/car-ui-customizations/README b/car_product/car_ui_portrait/rro/car-ui-customizations/README
new file mode 100644
index 0000000..1e14b27
--- /dev/null
+++ b/car_product/car_ui_portrait/rro/car-ui-customizations/README
@@ -0,0 +1,2 @@
+The values in this RRO are for modifying the car-ui-lib values and should be applied to all
+applications using car-ui-lib
\ No newline at end of file
diff --git a/car_product/car_ui_portrait/rro/car-ui-customizations/product.mk b/car_product/car_ui_portrait/rro/car-ui-customizations/product.mk
index a4c86bd..a7c3808 100644
--- a/car_product/car_ui_portrait/rro/car-ui-customizations/product.mk
+++ b/car_product/car_ui_portrait/rro/car-ui-customizations/product.mk
@@ -17,5 +17,35 @@
# Inherit from this product to include the "Car Ui Portrait" RROs for CarUi
# Include generated RROs
PRODUCT_PACKAGES += \
- generatedcaruiportrait-com-android-car-media \
- generatedcaruiportrait-com-android-car-dialer \
+ generated_caruiportrait_customization-com-android-car-ui-paintbooth \
+ generated_caruiportrait_customization-com-google-android-car-ui-paintbooth \
+ generated_caruiportrait_customization-com-google-android-carui-ats \
+ generated_caruiportrait_customization-com-android-car-rotaryplayground \
+ generated_caruiportrait_customization-com-android-car-themeplayground \
+ generated_caruiportrait_customization-com-android-car-carlauncher \
+ generated_caruiportrait_customization-com-android-car-home \
+ generated_caruiportrait_customization-com-android-car-media \
+ generated_caruiportrait_customization-com-android-car-radio \
+ generated_caruiportrait_customization-com-android-car-calendar \
+ generated_caruiportrait_customization-com-android-car-companiondevicesupport \
+ generated_caruiportrait_customization-com-android-car-systemupdater \
+ generated_caruiportrait_customization-com-android-car-dialer \
+ generated_caruiportrait_customization-com-android-car-linkviewer \
+ generated_caruiportrait_customization-com-android-car-settings \
+ generated_caruiportrait_customization-com-android-car-voicecontrol \
+ generated_caruiportrait_customization-com-android-car-faceenroll \
+ generated_caruiportrait_customization-com-android-car-developeroptions \
+ generated_caruiportrait_customization-com-android-managedprovisioning \
+ generated_caruiportrait_customization-com-android-settings-intelligence \
+ generated_caruiportrait_customization-com-google-android-apps-automotive-inputmethod \
+ generated_caruiportrait_customization-com-google-android-apps-automotive-inputmethod-dev \
+ generated_caruiportrait_customization-com-google-android-apps-automotive-templates-host \
+ generated_caruiportrait_customization-com-google-android-embedded-projection \
+ generated_caruiportrait_customization-com-google-android-gms \
+ generated_caruiportrait_customization-com-google-android-gsf \
+ generated_caruiportrait_customization-com-google-android-packageinstaller \
+ generated_caruiportrait_customization-com-google-android-permissioncontroller \
+ generated_caruiportrait_customization-com-google-android-carassistant \
+ generated_caruiportrait_customization-com-google-android-tts \
+ generated_caruiportrait_customization-com-android-htmlviewer \
+ generated_caruiportrait_customization-com-android-vending
diff --git a/car_product/car_ui_portrait/rro/alert-dialog-customizations/res/layout/car_ui_alert_dialog_title_with_subtitle.xml b/car_product/car_ui_portrait/rro/car-ui-customizations/res/layout/car_ui_alert_dialog_title_with_subtitle.xml
similarity index 100%
rename from car_product/car_ui_portrait/rro/alert-dialog-customizations/res/layout/car_ui_alert_dialog_title_with_subtitle.xml
rename to car_product/car_ui_portrait/rro/car-ui-customizations/res/layout/car_ui_alert_dialog_title_with_subtitle.xml
diff --git a/car_product/car_ui_portrait/rro/car-ui-customizations/res/values/attrs.xml b/car_product/car_ui_portrait/rro/car-ui-customizations/res/values/attrs.xml
index ee658e3..6b60f12 100644
--- a/car_product/car_ui_portrait/rro/car-ui-customizations/res/values/attrs.xml
+++ b/car_product/car_ui_portrait/rro/car-ui-customizations/res/values/attrs.xml
@@ -16,65 +16,4 @@
-->
<resources>
<attr name="state_ux_restricted" format="boolean" />
-
- <attr name="layout_constraintGuide_begin" format="dimension"/>
- <attr name="layout_constraintGuide_end" format="dimension"/>
- <attr name="layout_constraintGuide_percent" format="float"/>
-
- <attr name="layout_constraintLeft_toLeftOf" format="reference|enum">
- <enum name="parent" value="0"/>
- </attr>
- <attr name="layout_constraintLeft_toRightOf" format="reference|enum">
- <enum name="parent" value="0"/>
- </attr>
- <attr name="layout_constraintRight_toLeftOf" format="reference|enum">
- <enum name="parent" value="0"/>
- </attr>
- <attr name="layout_constraintRight_toRightOf" format="reference|enum">
- <enum name="parent" value="0"/>
- </attr>
- <attr name="layout_constraintTop_toTopOf" format="reference|enum">
- <enum name="parent" value="0"/>
- </attr>
- <attr name="layout_constraintTop_toBottomOf" format="reference|enum">
- <enum name="parent" value="0"/>
- </attr>
- <attr name="layout_constraintBottom_toTopOf" format="reference|enum">
- <enum name="parent" value="0"/>
- </attr>
- <attr name="layout_constraintBottom_toBottomOf" format="reference|enum">
- <enum name="parent" value="0"/>
- </attr>
- <attr name="layout_constraintBaseline_toBaselineOf" format="reference|enum">
- <enum name="parent" value="0"/>
- </attr>
- <attr name="layout_constraintStart_toEndOf" format="reference|enum">
- <enum name="parent" value="0"/>
- </attr>
- <attr name="layout_constraintStart_toStartOf" format="reference|enum">
- <enum name="parent" value="0"/>
- </attr>
- <attr name="layout_constraintEnd_toStartOf" format="reference|enum">
- <enum name="parent" value="0"/>
- </attr>
- <attr name="layout_constraintEnd_toEndOf" format="reference|enum">
- <enum name="parent" value="0"/>
- </attr>
-
- <attr name="layout_constraintHorizontal_bias" format="float"/>
- <attr name="layout_constraintVertical_bias" format="float"/>
-
- <attr name="layout_goneMarginLeft" format="dimension"/>
- <attr name="layout_goneMarginTop" format="dimension"/>
- <attr name="layout_goneMarginRight" format="dimension"/>
- <attr name="layout_goneMarginBottom" format="dimension"/>
- <attr name="layout_goneMarginStart" format="dimension"/>
- <attr name="layout_goneMarginEnd" format="dimension"/>
-
- <attr name="layout_constraintHorizontal_chainStyle" format="enum">
- <enum name="spread" value="0"/>
- <enum name="spread_inside" value="1"/>
- <enum name="packed" value="2"/>
- </attr>
-
</resources>
diff --git a/car_product/car_ui_portrait/rro/alert-dialog-customizations/res/values/dimens.xml b/car_product/car_ui_portrait/rro/car-ui-customizations/res/values/dimens.xml
similarity index 100%
rename from car_product/car_ui_portrait/rro/alert-dialog-customizations/res/values/dimens.xml
rename to car_product/car_ui_portrait/rro/car-ui-customizations/res/values/dimens.xml
diff --git a/car_product/car_ui_portrait/rro/alert-dialog-customizations/res/values/styles.xml b/car_product/car_ui_portrait/rro/car-ui-customizations/res/values/styles.xml
similarity index 100%
rename from car_product/car_ui_portrait/rro/alert-dialog-customizations/res/values/styles.xml
rename to car_product/car_ui_portrait/rro/car-ui-customizations/res/values/styles.xml
diff --git a/car_product/car_ui_portrait/rro/car-ui-customizations/res/values/themes.xml b/car_product/car_ui_portrait/rro/car-ui-customizations/res/values/themes.xml
new file mode 100644
index 0000000..62b5c1b
--- /dev/null
+++ b/car_product/car_ui_portrait/rro/car-ui-customizations/res/values/themes.xml
@@ -0,0 +1,27 @@
+<!--
+ ~ Copyright (C) 2021 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>
+ <style name="TextAppearance.CarUi.Widget" parent="android:TextAppearance.Material.Widget">
+ <item name="android:textAlignment">viewStart</item>
+ </style>
+
+ <style name="TextAppearance.CarUi.Widget.Toolbar"/>
+
+ <style name="TextAppearance.CarUi.Widget.Toolbar.Title">
+ <item name="android:singleLine">true</item>
+ <item name="android:textSize">32sp</item>
+ </style>
+</resources>
\ No newline at end of file
diff --git a/car_product/car_ui_portrait/rro/car-ui-customizations/res/xml/overlays.xml b/car_product/car_ui_portrait/rro/car-ui-customizations/res/xml/overlays.xml
index 204321c..0099f9b 100644
--- a/car_product/car_ui_portrait/rro/car-ui-customizations/res/xml/overlays.xml
+++ b/car_product/car_ui_portrait/rro/car-ui-customizations/res/xml/overlays.xml
@@ -15,28 +15,14 @@
limitations under the License.
-->
<overlay>
- <item target="layout/car_ui_base_layout_toolbar" value="@layout/car_ui_base_layout_toolbar"/>
- <item target="layout/car_ui_toolbar_tab_item" value="@layout/car_ui_toolbar_tab_item"/>
+ <item target="layout/car_ui_alert_dialog_title_with_subtitle" value="@layout/car_ui_alert_dialog_title_with_subtitle"/>
- <item target="bool/car_ui_toolbar_logo_fills_nav_icon_space" value="@bool/car_ui_toolbar_logo_fills_nav_icon_space" />
- <item target="bool/car_ui_toolbar_tab_flexible_layout" value="@bool/car_ui_toolbar_tab_flexible_layout" />
- <item target="bool/car_ui_scrollbar_enable" value="@bool/car_ui_scrollbar_enable" />
+ <item target="id/car_ui_alert_icon" value="@id/car_ui_alert_icon"/>
+ <item target="id/car_ui_alert_title" value="@id/car_ui_alert_title"/>
+ <item target="id/car_ui_alert_subtitle" value="@id/car_ui_alert_subtitle"/>
- <item target="id/car_ui_toolbar_nav_icon_container" value="@id/car_ui_toolbar_nav_icon_container" />
- <item target="id/car_ui_toolbar_nav_icon" value="@id/car_ui_toolbar_nav_icon" />
- <item target="id/car_ui_toolbar_logo" value="@id/car_ui_toolbar_logo" />
- <item target="id/car_ui_toolbar_title_logo_container" value="@id/car_ui_toolbar_title_logo_container" />
- <item target="id/car_ui_toolbar_title_logo" value="@id/car_ui_toolbar_title_logo" />
- <item target="id/car_ui_toolbar_title" value="@id/car_ui_toolbar_title" />
- <item target="id/car_ui_toolbar_title_container" value="@id/car_ui_toolbar_title_container" />
- <item target="id/car_ui_toolbar_subtitle" value="@id/car_ui_toolbar_subtitle" />
- <item target="id/car_ui_toolbar_tabs" value="@id/car_ui_toolbar_tabs" />
- <item target="id/car_ui_toolbar_menu_items_container" value="@id/car_ui_toolbar_menu_items_container" />
- <item target="id/car_ui_toolbar_search_view_container" value="@id/car_ui_toolbar_search_view_container" />
- <item target="id/car_ui_toolbar_progress_bar" value="@id/car_ui_toolbar_progress_bar" />
- <item target="id/car_ui_base_layout_content_container" value="@id/car_ui_base_layout_content_container" />
- <item target="id/car_ui_toolbar_tab_item_icon" value="@id/car_ui_toolbar_tab_item_icon" />
- <item target="id/car_ui_toolbar_tab_item_text" value="@id/car_ui_toolbar_tab_item_text" />
+ <item target="dimen/car_ui_body1_size" value="@dimen/car_ui_body1_size"/>
+ <item target="dimen/car_ui_body3_size" value="@dimen/car_ui_body3_size"/>
<item target="drawable/car_ui_recyclerview_ic_up" value="@drawable/car_ui_recyclerview_ic_up" />
<item target="drawable/car_ui_recyclerview_ic_down" value="@drawable/car_ui_recyclerview_ic_down" />
@@ -45,26 +31,4 @@
<item target="drawable/car_ui_toolbar_menu_item_icon_background" value="@drawable/car_ui_toolbar_menu_item_icon_background" />
<item target="attr/state_ux_restricted" value="@attr/state_ux_restricted"/>
- <item target="attr/layout_constraintGuide_begin" value="@attr/layout_constraintGuide_begin"/>
- <item target="attr/layout_constraintGuide_end" value="@attr/layout_constraintGuide_end"/>
- <item target="attr/layout_constraintStart_toStartOf" value="@attr/layout_constraintStart_toStartOf"/>
- <item target="attr/layout_constraintStart_toEndOf" value="@attr/layout_constraintStart_toEndOf"/>
- <item target="attr/layout_constraintEnd_toStartOf" value="@attr/layout_constraintEnd_toStartOf"/>
- <item target="attr/layout_constraintEnd_toEndOf" value="@attr/layout_constraintEnd_toEndOf"/>
- <item target="attr/layout_constraintLeft_toLeftOf" value="@attr/layout_constraintLeft_toLeftOf"/>
- <item target="attr/layout_constraintLeft_toRightOf" value="@attr/layout_constraintLeft_toRightOf"/>
- <item target="attr/layout_constraintRight_toLeftOf" value="@attr/layout_constraintRight_toLeftOf"/>
- <item target="attr/layout_constraintRight_toRightOf" value="@attr/layout_constraintRight_toRightOf"/>
- <item target="attr/layout_constraintTop_toTopOf" value="@attr/layout_constraintTop_toTopOf"/>
- <item target="attr/layout_constraintTop_toBottomOf" value="@attr/layout_constraintTop_toBottomOf"/>
- <item target="attr/layout_constraintBottom_toTopOf" value="@attr/layout_constraintBottom_toTopOf"/>
- <item target="attr/layout_constraintBottom_toBottomOf" value="@attr/layout_constraintBottom_toBottomOf"/>
- <item target="attr/layout_constraintHorizontal_bias" value="@attr/layout_constraintHorizontal_bias"/>
- <item target="attr/layout_goneMarginLeft" value="@attr/layout_goneMarginLeft"/>
- <item target="attr/layout_goneMarginRight" value="@attr/layout_goneMarginRight"/>
- <item target="attr/layout_goneMarginTop" value="@attr/layout_goneMarginTop"/>
- <item target="attr/layout_goneMarginBottom" value="@attr/layout_goneMarginBottom"/>
- <item target="attr/layout_goneMarginStart" value="@attr/layout_goneMarginStart"/>
- <item target="attr/layout_goneMarginEnd" value="@attr/layout_goneMarginEnd"/>
- <item target="attr/layout_constraintHorizontal_chainStyle" value="@attr/layout_constraintHorizontal_chainStyle"/>
</overlay>
diff --git a/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/Android.mk b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/Android.mk
new file mode 100644
index 0000000..1b06791
--- /dev/null
+++ b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/Android.mk
@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2021 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.
+#
+
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+CAR_UI_RRO_SET_NAME := generated_caruiportrait_toolbar
+CAR_UI_RRO_MANIFEST_FILE := $(LOCAL_PATH)/AndroidManifest.xml
+CAR_UI_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+CAR_UI_RRO_TARGETS := \
+ com.android.car.media \
+ com.android.car.dialer \
+
+include packages/apps/Car/libs/car-ui-lib/generate_rros.mk
diff --git a/car_product/car_ui_portrait/rro/alert-dialog-customizations/AndroidManifest.xml b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/AndroidManifest.xml
similarity index 100%
rename from car_product/car_ui_portrait/rro/alert-dialog-customizations/AndroidManifest.xml
rename to car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/AndroidManifest.xml
diff --git a/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/README b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/README
new file mode 100644
index 0000000..e199f7b
--- /dev/null
+++ b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/README
@@ -0,0 +1,2 @@
+The values in this RRO are to change the placement of the car-ui toolbar as such it currently
+is only targeting a limited set of applications.
\ No newline at end of file
diff --git a/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/product.mk b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/product.mk
new file mode 100644
index 0000000..789b053
--- /dev/null
+++ b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/product.mk
@@ -0,0 +1,21 @@
+#
+# Copyright (C) 2021 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.
+#
+
+# Inherit from this product to include the "Car Ui Portrait" RROs for CarUi
+# Include generated RROs
+PRODUCT_PACKAGES += \
+ generated_caruiportrait-com-android-car-media \
+ generated_caruiportrait-com-android-car-dialer \
diff --git a/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/color/car_ui_text_color_primary.xml b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/color/car_ui_text_color_primary.xml
new file mode 100644
index 0000000..860f219
--- /dev/null
+++ b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/color/car_ui_text_color_primary.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 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.
+-->
+<!-- Copy of ?android:attr/textColorPrimary (frameworks/base/res/res/color/text_color_primary.xml)
+ but with a ux restricted state. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+ <item android:state_enabled="false"
+ android:alpha="?android:attr/disabledAlpha"
+ android:color="?android:attr/colorForeground"/>
+ <item app:state_ux_restricted="true"
+ android:alpha="?android:attr/disabledAlpha"
+ android:color="?android:attr/colorForeground"/>
+ <item android:color="?android:attr/colorForeground"/>
+</selector>
diff --git a/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/color/car_ui_text_color_secondary.xml b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/color/car_ui_text_color_secondary.xml
new file mode 100644
index 0000000..f99fc86
--- /dev/null
+++ b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/color/car_ui_text_color_secondary.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 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.
+-->
+<!-- Copy of ?android:attr/textColorSecondary (frameworks/base/res/res/color/text_color_secondary.xml)
+ but with a ux restricted state. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+ <item android:state_enabled="false"
+ android:alpha="?android:attr/disabledAlpha"
+ android:color="?android:attr/colorForeground"/>
+ <item app:state_ux_restricted="true"
+ android:alpha="?android:attr/disabledAlpha"
+ android:color="?android:attr/colorForeground"/>
+ <item android:color="?android:attr/colorForeground"/>
+</selector>
diff --git a/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/color/car_ui_toolbar_tab_item_selector.xml b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/color/car_ui_toolbar_tab_item_selector.xml
new file mode 100644
index 0000000..02d4374
--- /dev/null
+++ b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/color/car_ui_toolbar_tab_item_selector.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 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.
+ -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:color="@color/car_ui_text_color_primary" android:state_activated="true"/>
+ <item android:color="@color/car_ui_text_color_secondary"/>
+</selector>
diff --git a/car_product/car_ui_portrait/rro/car-ui-customizations/res/color/tab_side_indicator_color.xml b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/color/tab_side_indicator_color.xml
similarity index 100%
rename from car_product/car_ui_portrait/rro/car-ui-customizations/res/color/tab_side_indicator_color.xml
rename to car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/color/tab_side_indicator_color.xml
diff --git a/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/drawable/car_ui_toolbar_menu_item_divider.xml b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/drawable/car_ui_toolbar_menu_item_divider.xml
new file mode 100644
index 0000000..9b47736
--- /dev/null
+++ b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/drawable/car_ui_toolbar_menu_item_divider.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2021 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.
+ ~
+ -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <size android:width="16dp"/>
+</shape>
diff --git a/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/drawable/car_ui_toolbar_menu_item_icon_ripple.xml b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/drawable/car_ui_toolbar_menu_item_icon_ripple.xml
new file mode 100644
index 0000000..9ac2a1f
--- /dev/null
+++ b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/drawable/car_ui_toolbar_menu_item_icon_ripple.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2021 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.
+ ~
+ -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="#27ffffff"
+ android:radius="48dp"/>
diff --git a/car_product/car_ui_portrait/rro/car-ui-customizations/res/drawable/tab_background.xml b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/drawable/tab_background.xml
similarity index 100%
rename from car_product/car_ui_portrait/rro/car-ui-customizations/res/drawable/tab_background.xml
rename to car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/drawable/tab_background.xml
diff --git a/car_product/car_ui_portrait/rro/car-ui-customizations/res/layout/car_ui_base_layout_toolbar.xml b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/layout/car_ui_base_layout_toolbar.xml
similarity index 100%
rename from car_product/car_ui_portrait/rro/car-ui-customizations/res/layout/car_ui_base_layout_toolbar.xml
rename to car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/layout/car_ui_base_layout_toolbar.xml
diff --git a/car_product/car_ui_portrait/rro/car-ui-customizations/res/layout/car_ui_toolbar_tab_item.xml b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/layout/car_ui_toolbar_tab_item.xml
similarity index 100%
rename from car_product/car_ui_portrait/rro/car-ui-customizations/res/layout/car_ui_toolbar_tab_item.xml
rename to car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/layout/car_ui_toolbar_tab_item.xml
diff --git a/car_product/car_ui_portrait/rro/car-ui-customizations/res/values-port/values.xml b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/values-port/values.xml
similarity index 100%
rename from car_product/car_ui_portrait/rro/car-ui-customizations/res/values-port/values.xml
rename to car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/values-port/values.xml
diff --git a/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/values/attrs.xml b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/values/attrs.xml
new file mode 100644
index 0000000..e06d40a
--- /dev/null
+++ b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/values/attrs.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 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>
+ <attr name="layout_constraintGuide_begin" format="dimension"/>
+ <attr name="layout_constraintGuide_end" format="dimension"/>
+ <attr name="layout_constraintGuide_percent" format="float"/>
+
+ <attr name="layout_constraintLeft_toLeftOf" format="reference|enum">
+ <enum name="parent" value="0"/>
+ </attr>
+ <attr name="layout_constraintLeft_toRightOf" format="reference|enum">
+ <enum name="parent" value="0"/>
+ </attr>
+ <attr name="layout_constraintRight_toLeftOf" format="reference|enum">
+ <enum name="parent" value="0"/>
+ </attr>
+ <attr name="layout_constraintRight_toRightOf" format="reference|enum">
+ <enum name="parent" value="0"/>
+ </attr>
+ <attr name="layout_constraintTop_toTopOf" format="reference|enum">
+ <enum name="parent" value="0"/>
+ </attr>
+ <attr name="layout_constraintTop_toBottomOf" format="reference|enum">
+ <enum name="parent" value="0"/>
+ </attr>
+ <attr name="layout_constraintBottom_toTopOf" format="reference|enum">
+ <enum name="parent" value="0"/>
+ </attr>
+ <attr name="layout_constraintBottom_toBottomOf" format="reference|enum">
+ <enum name="parent" value="0"/>
+ </attr>
+ <attr name="layout_constraintBaseline_toBaselineOf" format="reference|enum">
+ <enum name="parent" value="0"/>
+ </attr>
+ <attr name="layout_constraintStart_toEndOf" format="reference|enum">
+ <enum name="parent" value="0"/>
+ </attr>
+ <attr name="layout_constraintStart_toStartOf" format="reference|enum">
+ <enum name="parent" value="0"/>
+ </attr>
+ <attr name="layout_constraintEnd_toStartOf" format="reference|enum">
+ <enum name="parent" value="0"/>
+ </attr>
+ <attr name="layout_constraintEnd_toEndOf" format="reference|enum">
+ <enum name="parent" value="0"/>
+ </attr>
+
+ <attr name="layout_constraintHorizontal_bias" format="float"/>
+ <attr name="layout_constraintVertical_bias" format="float"/>
+
+ <attr name="layout_goneMarginLeft" format="dimension"/>
+ <attr name="layout_goneMarginTop" format="dimension"/>
+ <attr name="layout_goneMarginRight" format="dimension"/>
+ <attr name="layout_goneMarginBottom" format="dimension"/>
+ <attr name="layout_goneMarginStart" format="dimension"/>
+ <attr name="layout_goneMarginEnd" format="dimension"/>
+
+ <attr name="layout_constraintHorizontal_chainStyle" format="enum">
+ <enum name="spread" value="0"/>
+ <enum name="spread_inside" value="1"/>
+ <enum name="packed" value="2"/>
+ </attr>
+ <attr name="state_ux_restricted" format="boolean" />
+</resources>
diff --git a/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/values/themes.xml b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/values/themes.xml
new file mode 100644
index 0000000..62b5c1b
--- /dev/null
+++ b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/values/themes.xml
@@ -0,0 +1,27 @@
+<!--
+ ~ Copyright (C) 2021 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>
+ <style name="TextAppearance.CarUi.Widget" parent="android:TextAppearance.Material.Widget">
+ <item name="android:textAlignment">viewStart</item>
+ </style>
+
+ <style name="TextAppearance.CarUi.Widget.Toolbar"/>
+
+ <style name="TextAppearance.CarUi.Widget.Toolbar.Title">
+ <item name="android:singleLine">true</item>
+ <item name="android:textSize">32sp</item>
+ </style>
+</resources>
\ No newline at end of file
diff --git a/car_product/car_ui_portrait/rro/car-ui-customizations/res/values/values.xml b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/values/values.xml
similarity index 70%
rename from car_product/car_ui_portrait/rro/car-ui-customizations/res/values/values.xml
rename to car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/values/values.xml
index e68a3f8..c8f85cf 100644
--- a/car_product/car_ui_portrait/rro/car-ui-customizations/res/values/values.xml
+++ b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/values/values.xml
@@ -19,17 +19,6 @@
<bool name="car_ui_toolbar_tab_flexible_layout">false</bool>
<bool name="car_ui_scrollbar_enable">false</bool>
- <style name="TextAppearance.CarUi.Widget" parent="android:TextAppearance.Material.Widget">
- <item name="android:textAlignment">viewStart</item>
- </style>
-
- <style name="TextAppearance.CarUi.Widget.Toolbar"/>
-
- <style name="TextAppearance.CarUi.Widget.Toolbar.Title">
- <item name="android:singleLine">true</item>
- <item name="android:textSize">32sp</item>
- </style>
-
<dimen name="car_ui_toolbar_logo_size">44dp</dimen>
<dimen name="car_ui_toolbar_nav_icon_size">44dp</dimen>
</resources>
diff --git a/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/xml/overlays.xml b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/xml/overlays.xml
new file mode 100644
index 0000000..4d4a97f
--- /dev/null
+++ b/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/res/xml/overlays.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 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.
+ -->
+<overlay>
+ <item target="layout/car_ui_base_layout_toolbar" value="@layout/car_ui_base_layout_toolbar"/>
+ <item target="layout/car_ui_toolbar_tab_item" value="@layout/car_ui_toolbar_tab_item"/>
+
+ <item target="bool/car_ui_toolbar_logo_fills_nav_icon_space" value="@bool/car_ui_toolbar_logo_fills_nav_icon_space" />
+ <item target="bool/car_ui_toolbar_tab_flexible_layout" value="@bool/car_ui_toolbar_tab_flexible_layout" />
+ <item target="bool/car_ui_scrollbar_enable" value="@bool/car_ui_scrollbar_enable" />
+
+ <item target="id/car_ui_toolbar_nav_icon_container" value="@id/car_ui_toolbar_nav_icon_container" />
+ <item target="id/car_ui_toolbar_nav_icon" value="@id/car_ui_toolbar_nav_icon" />
+ <item target="id/car_ui_toolbar_logo" value="@id/car_ui_toolbar_logo" />
+ <item target="id/car_ui_toolbar_title_logo_container" value="@id/car_ui_toolbar_title_logo_container" />
+ <item target="id/car_ui_toolbar_title_logo" value="@id/car_ui_toolbar_title_logo" />
+ <item target="id/car_ui_toolbar_title" value="@id/car_ui_toolbar_title" />
+ <item target="id/car_ui_toolbar_title_container" value="@id/car_ui_toolbar_title_container" />
+ <item target="id/car_ui_toolbar_subtitle" value="@id/car_ui_toolbar_subtitle" />
+ <item target="id/car_ui_toolbar_tabs" value="@id/car_ui_toolbar_tabs" />
+ <item target="id/car_ui_toolbar_menu_items_container" value="@id/car_ui_toolbar_menu_items_container" />
+ <item target="id/car_ui_toolbar_search_view_container" value="@id/car_ui_toolbar_search_view_container" />
+ <item target="id/car_ui_toolbar_progress_bar" value="@id/car_ui_toolbar_progress_bar" />
+ <item target="id/car_ui_base_layout_content_container" value="@id/car_ui_base_layout_content_container" />
+ <item target="id/car_ui_toolbar_tab_item_icon" value="@id/car_ui_toolbar_tab_item_icon" />
+ <item target="id/car_ui_toolbar_tab_item_text" value="@id/car_ui_toolbar_tab_item_text" />
+
+ <item target="attr/layout_constraintGuide_begin" value="@attr/layout_constraintGuide_begin"/>
+ <item target="attr/layout_constraintGuide_end" value="@attr/layout_constraintGuide_end"/>
+ <item target="attr/layout_constraintStart_toStartOf" value="@attr/layout_constraintStart_toStartOf"/>
+ <item target="attr/layout_constraintStart_toEndOf" value="@attr/layout_constraintStart_toEndOf"/>
+ <item target="attr/layout_constraintEnd_toStartOf" value="@attr/layout_constraintEnd_toStartOf"/>
+ <item target="attr/layout_constraintEnd_toEndOf" value="@attr/layout_constraintEnd_toEndOf"/>
+ <item target="attr/layout_constraintLeft_toLeftOf" value="@attr/layout_constraintLeft_toLeftOf"/>
+ <item target="attr/layout_constraintLeft_toRightOf" value="@attr/layout_constraintLeft_toRightOf"/>
+ <item target="attr/layout_constraintRight_toLeftOf" value="@attr/layout_constraintRight_toLeftOf"/>
+ <item target="attr/layout_constraintRight_toRightOf" value="@attr/layout_constraintRight_toRightOf"/>
+ <item target="attr/layout_constraintTop_toTopOf" value="@attr/layout_constraintTop_toTopOf"/>
+ <item target="attr/layout_constraintTop_toBottomOf" value="@attr/layout_constraintTop_toBottomOf"/>
+ <item target="attr/layout_constraintBottom_toTopOf" value="@attr/layout_constraintBottom_toTopOf"/>
+ <item target="attr/layout_constraintBottom_toBottomOf" value="@attr/layout_constraintBottom_toBottomOf"/>
+ <item target="attr/layout_constraintHorizontal_bias" value="@attr/layout_constraintHorizontal_bias"/>
+ <item target="attr/layout_goneMarginLeft" value="@attr/layout_goneMarginLeft"/>
+ <item target="attr/layout_goneMarginRight" value="@attr/layout_goneMarginRight"/>
+ <item target="attr/layout_goneMarginTop" value="@attr/layout_goneMarginTop"/>
+ <item target="attr/layout_goneMarginBottom" value="@attr/layout_goneMarginBottom"/>
+ <item target="attr/layout_goneMarginStart" value="@attr/layout_goneMarginStart"/>
+ <item target="attr/layout_goneMarginEnd" value="@attr/layout_goneMarginEnd"/>
+ <item target="attr/layout_constraintHorizontal_chainStyle" value="@attr/layout_constraintHorizontal_chainStyle"/>
+ <item target="attr/state_ux_restricted" value="@attr/state_ux_restricted"/>
+</overlay>
diff --git a/car_product/car_ui_portrait/rro/car_ui_portrait_rro.mk b/car_product/car_ui_portrait/rro/car_ui_portrait_rro.mk
index 8eb667c..b3348fe 100644
--- a/car_product/car_ui_portrait/rro/car_ui_portrait_rro.mk
+++ b/car_product/car_ui_portrait/rro/car_ui_portrait_rro.mk
@@ -14,8 +14,8 @@
# limitations under the License.
#
-$(call inherit-product, packages/services/Car/car_product/car_ui_portrait/rro/alert-dialog-customizations/product.mk)
$(call inherit-product, packages/services/Car/car_product/car_ui_portrait/rro/car-ui-customizations/product.mk)
+$(call inherit-product, packages/services/Car/car_product/car_ui_portrait/rro/car-ui-toolbar-customizations/product.mk)
# All RROs to be included in car_ui_portrait builds.
PRODUCT_PACKAGES += \
diff --git a/car_product/car_ui_portrait/rro/common-res/res/color/car_ui_text_color_primary.xml b/car_product/car_ui_portrait/rro/common-res/res/color/car_ui_text_color_primary.xml
new file mode 100644
index 0000000..860f219
--- /dev/null
+++ b/car_product/car_ui_portrait/rro/common-res/res/color/car_ui_text_color_primary.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 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.
+-->
+<!-- Copy of ?android:attr/textColorPrimary (frameworks/base/res/res/color/text_color_primary.xml)
+ but with a ux restricted state. -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:app="http://schemas.android.com/apk/res-auto">
+ <item android:state_enabled="false"
+ android:alpha="?android:attr/disabledAlpha"
+ android:color="?android:attr/colorForeground"/>
+ <item app:state_ux_restricted="true"
+ android:alpha="?android:attr/disabledAlpha"
+ android:color="?android:attr/colorForeground"/>
+ <item android:color="?android:attr/colorForeground"/>
+</selector>