Migrate overlay resources to new RROs
Bug: 298703944
Test: adb shell cmd overlay list
Change-Id: I0c7e4e372203f5d587a53ed2445d2b4ebc7d1c89
diff --git a/car_product/build/car_base.mk b/car_product/build/car_base.mk
index 88cacd3..35f1e43 100644
--- a/car_product/build/car_base.mk
+++ b/car_product/build/car_base.mk
@@ -18,11 +18,16 @@
# car packages should be added to car.mk instead of here
ifeq ($(DISABLE_CAR_PRODUCT_CONFIG_OVERLAY),)
-PRODUCT_PACKAGE_OVERLAYS += packages/services/Car/car_product/overlay
+PRODUCT_PACKAGES += \
+ CarFrameworkResConfigRRO \
+ CarCertInstallerConfigRRO \
+ CarSettingsProviderConfigRRO \
+ CarTelecommConfigRRO
endif
ifeq ($(DISABLE_CAR_PRODUCT_VISUAL_OVERLAY),)
PRODUCT_PACKAGE_OVERLAYS += packages/services/Car/car_product/overlay-visual
+PRODUCT_PACKAGES += CarFrameworkResVisualRRO
endif
PRODUCT_PACKAGES += \
diff --git a/car_product/build/car_product.mk b/car_product/build/car_product.mk
index 4a98375..3da6acf 100644
--- a/car_product/build/car_product.mk
+++ b/car_product/build/car_product.mk
@@ -52,11 +52,16 @@
endif
ifeq ($(DISABLE_CAR_PRODUCT_CONFIG_OVERLAY),)
-PRODUCT_PACKAGE_OVERLAYS += packages/services/Car/car_product/overlay
+PRODUCT_PACKAGES += \
+ CarFrameworkResConfigRRO \
+ CarCertInstallerConfigRRO \
+ CarSettingsProviderConfigRRO \
+ CarTelecommConfigRRO
endif
ifeq ($(DISABLE_CAR_PRODUCT_VISUAL_OVERLAY),)
PRODUCT_PACKAGE_OVERLAYS += packages/services/Car/car_product/overlay-visual
+PRODUCT_PACKAGES += CarFrameworkResVisualRRO
endif
# CarSystemUIPassengerOverlay is an RRO package required for enabling unique look
diff --git a/car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-h600dp/dimens.xml b/car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-h600dp/dimens.xml
deleted file mode 100644
index 3140afc..0000000
--- a/car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-h600dp/dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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>
- <!-- The height of the header for a container containing child notifications. -->
- <dimen name="notification_children_container_header_height">96dp</dimen>
-
- <!-- The top margin for the notification children container in its non-expanded form. This
- value is smaller than notification_children_container_header_height to bring the first
- child closer so there is less wasted space. -->
- <dimen name="notification_children_container_margin_top">88dp</dimen>
-</resources>
diff --git a/car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-sw600dp/dimens.xml b/car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-sw600dp/dimens.xml
deleted file mode 100644
index 7b85870..0000000
--- a/car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-sw600dp/dimens.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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>
- <!-- The width of the panel holding the notification cards. -->
- <dimen name="notification_panel_width">744dp</dimen>
-</resources>
diff --git a/car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-w1024dp/dimens.xml b/car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-w1024dp/dimens.xml
deleted file mode 100644
index 932bae2..0000000
--- a/car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-w1024dp/dimens.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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>
- <!-- The width of panel holding the notification card. -->
- <dimen name="notification_panel_width">744dp</dimen>
-</resources>
diff --git a/car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-w550dp-land/dimens.xml b/car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-w550dp-land/dimens.xml
deleted file mode 100644
index 2248352..0000000
--- a/car_product/overlay-visual/frameworks/base/packages/CarSystemUI/res/values-w550dp-land/dimens.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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>
- <!-- The width of panel holding the notification card. -->
- <dimen name="notification_panel_width">522dp</dimen>
-</resources>
diff --git a/car_product/overlay/packages/apps/CertInstaller/res/values/config.xml b/car_product/rro/overlay-config/CertInstallerRRO/res/values/config.xml
similarity index 100%
rename from car_product/overlay/packages/apps/CertInstaller/res/values/config.xml
rename to car_product/rro/overlay-config/CertInstallerRRO/res/values/config.xml
diff --git a/car_product/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/car_product/rro/overlay-config/SettingsProviderRRO/res/values/defaults.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
rename to car_product/rro/overlay-config/SettingsProviderRRO/res/values/defaults.xml
diff --git a/car_product/overlay/packages/services/Telecomm/res/values/config.xml b/car_product/rro/overlay-config/TelecommRRO/res/values/config.xml
similarity index 100%
rename from car_product/overlay/packages/services/Telecomm/res/values/config.xml
rename to car_product/rro/overlay-config/TelecommRRO/res/values/config.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-af/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-af/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-af/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-af/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-am/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-am/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-am/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-am/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ar/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-ar/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-ar/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-ar/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-as/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-as/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-as/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-as/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-az/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-az/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-az/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-az/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-b+sr+Latn/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-b+sr+Latn/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-b+sr+Latn/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-b+sr+Latn/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-be/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-be/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-be/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-be/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-bg/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-bg/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-bg/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-bg/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-bn/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-bn/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-bn/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-bn/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-bs/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-bs/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-bs/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-bs/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ca/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-ca/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-ca/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-ca/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-cs/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-cs/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-cs/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-cs/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-da/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-da/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-da/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-da/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-de/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-de/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-de/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-de/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-el/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-el/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-el/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-el/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-en-rAU/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-en-rAU/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-en-rAU/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-en-rAU/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-en-rCA/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-en-rCA/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-en-rCA/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-en-rCA/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-en-rGB/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-en-rGB/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-en-rGB/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-en-rIN/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-en-rIN/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-en-rIN/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-en-rXC/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-en-rXC/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-en-rXC/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-en-rXC/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-es-rUS/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-es-rUS/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-es-rUS/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-es/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-es/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-es/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-es/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-et/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-et/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-et/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-et/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-eu/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-eu/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-eu/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-eu/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-fa/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-fa/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-fa/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-fa/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-fi/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-fi/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-fi/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-fi/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-fr-rCA/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-fr-rCA/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-fr-rCA/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-fr/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-fr/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-fr/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-fr/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-gl/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-gl/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-gl/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-gl/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-gu/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-gu/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-gu/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-gu/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-hi/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-hi/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-hi/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-hi/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-hr/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-hr/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-hr/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-hr/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-hu/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-hu/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-hu/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-hu/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-hy/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-hy/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-hy/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-hy/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-in/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-in/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-in/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-in/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-is/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-is/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-is/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-is/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-it/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-it/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-it/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-it/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-iw/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-iw/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-iw/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-iw/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ja/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-ja/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-ja/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-ja/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ka/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-ka/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-ka/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-ka/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-kk/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-kk/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-kk/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-kk/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-km/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-km/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-km/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-km/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-kn/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-kn/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-kn/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-kn/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ko/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-ko/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-ko/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-ko/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ky/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-ky/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-ky/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-ky/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-lo/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-lo/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-lo/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-lo/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-lt/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-lt/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-lt/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-lt/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-lv/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-lv/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-lv/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-lv/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-mk/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-mk/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-mk/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-mk/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ml/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-ml/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-ml/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-ml/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-mn/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-mn/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-mn/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-mn/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-mr/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-mr/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-mr/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-mr/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ms/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-ms/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-ms/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-ms/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-my/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-my/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-my/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-my/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-nb/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-nb/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-nb/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-nb/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ne/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-ne/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-ne/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-ne/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-nl/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-nl/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-nl/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-nl/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-or/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-or/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-or/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-or/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-pa/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-pa/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-pa/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-pa/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-pl/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-pl/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-pl/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-pl/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-pt-rPT/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-pt-rPT/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-pt-rPT/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-pt/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-pt/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-pt/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-pt/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ro/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-ro/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-ro/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-ro/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ru/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-ru/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-ru/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-ru/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-si/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-si/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-si/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-si/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-sk/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-sk/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-sk/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-sk/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-sl/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-sl/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-sl/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-sl/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-sq/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-sq/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-sq/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-sq/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-sr/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-sr/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-sr/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-sr/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-sv/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-sv/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-sv/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-sv/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-sw/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-sw/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-sw/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-sw/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ta/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-ta/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-ta/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-ta/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-te/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-te/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-te/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-te/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-th/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-th/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-th/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-th/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-tl/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-tl/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-tl/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-tl/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-tr/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-tr/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-tr/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-tr/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-uk/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-uk/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-uk/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-uk/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-ur/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-ur/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-ur/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-ur/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-uz/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-uz/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-uz/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-uz/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-vi/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-vi/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-vi/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-vi/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-zh-rCN/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-zh-rCN/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-zh-rCN/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-zh-rHK/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-zh-rHK/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-zh-rHK/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-zh-rTW/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-zh-rTW/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-zh-rTW/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values-zu/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values-zu/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values-zu/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values-zu/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values/config.xml b/car_product/rro/overlay-config/androidRRO/res/values/config.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values/config.xml
rename to car_product/rro/overlay-config/androidRRO/res/values/config.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values/policy_exempt_apps.xml b/car_product/rro/overlay-config/androidRRO/res/values/policy_exempt_apps.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values/policy_exempt_apps.xml
rename to car_product/rro/overlay-config/androidRRO/res/values/policy_exempt_apps.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values/required_apps_managed_user.xml b/car_product/rro/overlay-config/androidRRO/res/values/required_apps_managed_user.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values/required_apps_managed_user.xml
rename to car_product/rro/overlay-config/androidRRO/res/values/required_apps_managed_user.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/values/strings.xml b/car_product/rro/overlay-config/androidRRO/res/values/strings.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/values/strings.xml
rename to car_product/rro/overlay-config/androidRRO/res/values/strings.xml
diff --git a/car_product/overlay/frameworks/base/core/res/res/xml/config_user_types.xml b/car_product/rro/overlay-config/androidRRO/res/xml/config_user_types.xml
similarity index 100%
rename from car_product/overlay/frameworks/base/core/res/res/xml/config_user_types.xml
rename to car_product/rro/overlay-config/androidRRO/res/xml/config_user_types.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/anim/fade_in.xml b/car_product/rro/overlay-visual/androidRRO/res/anim/fade_in.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/anim/fade_in.xml
rename to car_product/rro/overlay-visual/androidRRO/res/anim/fade_in.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/anim/fade_out.xml b/car_product/rro/overlay-visual/androidRRO/res/anim/fade_out.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/anim/fade_out.xml
rename to car_product/rro/overlay-visual/androidRRO/res/anim/fade_out.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/color/car_radio_button_unchecked_color.xml b/car_product/rro/overlay-visual/androidRRO/res/color/car_radio_button_unchecked_color.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/color/car_radio_button_unchecked_color.xml
rename to car_product/rro/overlay-visual/androidRRO/res/color/car_radio_button_unchecked_color.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/color/car_seekbar_thumb_selected_background_color_selector.xml b/car_product/rro/overlay-visual/androidRRO/res/color/car_seekbar_thumb_selected_background_color_selector.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/color/car_seekbar_thumb_selected_background_color_selector.xml
rename to car_product/rro/overlay-visual/androidRRO/res/color/car_seekbar_thumb_selected_background_color_selector.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/color/car_seekbar_thumb_selected_stroke_color_selector.xml b/car_product/rro/overlay-visual/androidRRO/res/color/car_seekbar_thumb_selected_stroke_color_selector.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/color/car_seekbar_thumb_selected_stroke_color_selector.xml
rename to car_product/rro/overlay-visual/androidRRO/res/color/car_seekbar_thumb_selected_stroke_color_selector.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/color/car_seekbar_thumb_selector.xml b/car_product/rro/overlay-visual/androidRRO/res/color/car_seekbar_thumb_selector.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/color/car_seekbar_thumb_selector.xml
rename to car_product/rro/overlay-visual/androidRRO/res/color/car_seekbar_thumb_selector.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/color/car_selection_controls_checked_color.xml b/car_product/rro/overlay-visual/androidRRO/res/color/car_selection_controls_checked_color.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/color/car_selection_controls_checked_color.xml
rename to car_product/rro/overlay-visual/androidRRO/res/color/car_selection_controls_checked_color.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/color/car_selection_controls_color.xml b/car_product/rro/overlay-visual/androidRRO/res/color/car_selection_controls_color.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/color/car_selection_controls_color.xml
rename to car_product/rro/overlay-visual/androidRRO/res/color/car_selection_controls_color.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/color/car_switch_thumb_selector.xml b/car_product/rro/overlay-visual/androidRRO/res/color/car_switch_thumb_selector.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/color/car_switch_thumb_selector.xml
rename to car_product/rro/overlay-visual/androidRRO/res/color/car_switch_thumb_selector.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/color/car_switch_track_background_selector.xml b/car_product/rro/overlay-visual/androidRRO/res/color/car_switch_track_background_selector.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/color/car_switch_track_background_selector.xml
rename to car_product/rro/overlay-visual/androidRRO/res/color/car_switch_track_background_selector.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable-hdpi/ic_launcher_android.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable-hdpi/ic_launcher_android.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable-hdpi/ic_launcher_android.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable-hdpi/ic_launcher_android.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable-mdpi/ic_launcher_android.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable-mdpi/ic_launcher_android.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable-mdpi/ic_launcher_android.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable-mdpi/ic_launcher_android.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable-night-nodpi/default_wallpaper.png b/car_product/rro/overlay-visual/androidRRO/res/drawable-night-nodpi/default_wallpaper.png
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable-night-nodpi/default_wallpaper.png
rename to car_product/rro/overlay-visual/androidRRO/res/drawable-night-nodpi/default_wallpaper.png
Binary files differ
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png b/car_product/rro/overlay-visual/androidRRO/res/drawable-nodpi/default_wallpaper.png
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png
rename to car_product/rro/overlay-visual/androidRRO/res/drawable-nodpi/default_wallpaper.png
Binary files differ
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable-sw600dp-night/default_wallpaper.png b/car_product/rro/overlay-visual/androidRRO/res/drawable-sw600dp-night/default_wallpaper.png
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable-sw600dp-night/default_wallpaper.png
rename to car_product/rro/overlay-visual/androidRRO/res/drawable-sw600dp-night/default_wallpaper.png
Binary files differ
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png b/car_product/rro/overlay-visual/androidRRO/res/drawable-sw600dp-nodpi/default_wallpaper.png
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable-sw600dp-nodpi/default_wallpaper.png
rename to car_product/rro/overlay-visual/androidRRO/res/drawable-sw600dp-nodpi/default_wallpaper.png
Binary files differ
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable-sw720dp-night/default_wallpaper.png b/car_product/rro/overlay-visual/androidRRO/res/drawable-sw720dp-night/default_wallpaper.png
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable-sw720dp-night/default_wallpaper.png
rename to car_product/rro/overlay-visual/androidRRO/res/drawable-sw720dp-night/default_wallpaper.png
Binary files differ
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png b/car_product/rro/overlay-visual/androidRRO/res/drawable-sw720dp-nodpi/default_wallpaper.png
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable-sw720dp-nodpi/default_wallpaper.png
rename to car_product/rro/overlay-visual/androidRRO/res/drawable-sw720dp-nodpi/default_wallpaper.png
Binary files differ
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable-xhdpi/ic_launcher_android.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable-xhdpi/ic_launcher_android.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable-xhdpi/ic_launcher_android.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable-xhdpi/ic_launcher_android.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable-xxhdpi/ic_launcher_android.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable-xxhdpi/ic_launcher_android.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable-xxhdpi/ic_launcher_android.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable-xxhdpi/ic_launcher_android.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable-xxxhdpi/ic_launcher_android.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable-xxxhdpi/ic_launcher_android.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable-xxxhdpi/ic_launcher_android.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable-xxxhdpi/ic_launcher_android.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/activated_item_background.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/activated_item_background.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/activated_item_background.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/activated_item_background.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/btn_borderless_car.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/btn_borderless_car.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/btn_borderless_car.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/btn_borderless_car.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_checkbox.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/car_checkbox.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_checkbox.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/car_checkbox.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_checkbox_checked_mtrl.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/car_checkbox_checked_mtrl.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_checkbox_checked_mtrl.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/car_checkbox_checked_mtrl.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_checkbox_checked_to_unchecked_mtrl_animation.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/car_checkbox_checked_to_unchecked_mtrl_animation.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_checkbox_checked_to_unchecked_mtrl_animation.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/car_checkbox_checked_to_unchecked_mtrl_animation.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_checkbox_focus_highlight.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/car_checkbox_focus_highlight.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_checkbox_focus_highlight.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/car_checkbox_focus_highlight.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_checkbox_material_anim.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/car_checkbox_material_anim.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_checkbox_material_anim.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/car_checkbox_material_anim.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_checkbox_unchecked_mtrl.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/car_checkbox_unchecked_mtrl.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_checkbox_unchecked_mtrl.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/car_checkbox_unchecked_mtrl.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_checkbox_unchecked_to_checked_mtrl_animation.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/car_checkbox_unchecked_to_checked_mtrl_animation.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_checkbox_unchecked_to_checked_mtrl_animation.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/car_checkbox_unchecked_to_checked_mtrl_animation.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_radio_button.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/car_radio_button.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_radio_button.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/car_radio_button.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_radio_button_checked.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/car_radio_button_checked.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_radio_button_checked.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/car_radio_button_checked.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_radio_button_focus_highlight.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/car_radio_button_focus_highlight.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_radio_button_focus_highlight.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/car_radio_button_focus_highlight.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_radio_button_unchecked.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/car_radio_button_unchecked.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_radio_button_unchecked.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/car_radio_button_unchecked.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_seekbar_thumb.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/car_seekbar_thumb.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_seekbar_thumb.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/car_seekbar_thumb.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_seekbar_thumb_selectable.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/car_seekbar_thumb_selectable.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_seekbar_thumb_selectable.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/car_seekbar_thumb_selectable.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_seekbar_track.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/car_seekbar_track.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_seekbar_track.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/car_seekbar_track.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_switch_thumb.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/car_switch_thumb.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_switch_thumb.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/car_switch_thumb.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_switch_track.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/car_switch_track.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_switch_track.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/car_switch_track.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_switch_track_focus_highlight.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/car_switch_track_focus_highlight.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/car_switch_track_focus_highlight.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/car_switch_track_focus_highlight.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/ic_account_circle.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/ic_account_circle.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/ic_account_circle.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/ic_account_circle.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/ic_collapse_notification.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/ic_collapse_notification.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/ic_collapse_notification.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/ic_collapse_notification.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/ic_expand_notification.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/ic_expand_notification.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/ic_expand_notification.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/ic_expand_notification.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/ic_launcher_android_foreground.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/ic_launcher_android_foreground.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/ic_launcher_android_foreground.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/ic_launcher_android_foreground.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/item_background.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/item_background.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/item_background.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/item_background.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/perm_group_camera.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/perm_group_camera.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/perm_group_camera.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/perm_group_camera.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/drawable/toast_frame.xml b/car_product/rro/overlay-visual/androidRRO/res/drawable/toast_frame.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/drawable/toast_frame.xml
rename to car_product/rro/overlay-visual/androidRRO/res/drawable/toast_frame.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/layout/notification_template_right_icon.xml b/car_product/rro/overlay-visual/androidRRO/res/layout/notification_template_right_icon.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/layout/notification_template_right_icon.xml
rename to car_product/rro/overlay-visual/androidRRO/res/layout/notification_template_right_icon.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/layout/resolve_list_item.xml b/car_product/rro/overlay-visual/androidRRO/res/layout/resolve_list_item.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/layout/resolve_list_item.xml
rename to car_product/rro/overlay-visual/androidRRO/res/layout/resolve_list_item.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/layout/resolver_different_item_header.xml b/car_product/rro/overlay-visual/androidRRO/res/layout/resolver_different_item_header.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/layout/resolver_different_item_header.xml
rename to car_product/rro/overlay-visual/androidRRO/res/layout/resolver_different_item_header.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/layout/resolver_list.xml b/car_product/rro/overlay-visual/androidRRO/res/layout/resolver_list.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/layout/resolver_list.xml
rename to car_product/rro/overlay-visual/androidRRO/res/layout/resolver_list.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/layout/resolver_list_with_default.xml b/car_product/rro/overlay-visual/androidRRO/res/layout/resolver_list_with_default.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/layout/resolver_list_with_default.xml
rename to car_product/rro/overlay-visual/androidRRO/res/layout/resolver_list_with_default.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/layout/transient_notification.xml b/car_product/rro/overlay-visual/androidRRO/res/layout/transient_notification.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/layout/transient_notification.xml
rename to car_product/rro/overlay-visual/androidRRO/res/layout/transient_notification.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/values-h1752dp/dimens.xml b/car_product/rro/overlay-visual/androidRRO/res/values-h1752dp/dimens.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/values-h1752dp/dimens.xml
rename to car_product/rro/overlay-visual/androidRRO/res/values-h1752dp/dimens.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/values-h600dp/dimens.xml b/car_product/rro/overlay-visual/androidRRO/res/values-h600dp/dimens.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/values-h600dp/dimens.xml
rename to car_product/rro/overlay-visual/androidRRO/res/values-h600dp/dimens.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/values-night/colors_car.xml b/car_product/rro/overlay-visual/androidRRO/res/values-night/colors_car.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/values-night/colors_car.xml
rename to car_product/rro/overlay-visual/androidRRO/res/values-night/colors_car.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/values-night/colors_device_defaults.xml b/car_product/rro/overlay-visual/androidRRO/res/values-night/colors_device_defaults.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/values-night/colors_device_defaults.xml
rename to car_product/rro/overlay-visual/androidRRO/res/values-night/colors_device_defaults.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/values-sw900dp/dimens.xml b/car_product/rro/overlay-visual/androidRRO/res/values-sw900dp/dimens.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/values-sw900dp/dimens.xml
rename to car_product/rro/overlay-visual/androidRRO/res/values-sw900dp/dimens.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/values-w1280dp/dimens.xml b/car_product/rro/overlay-visual/androidRRO/res/values-w1280dp/dimens.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/values-w1280dp/dimens.xml
rename to car_product/rro/overlay-visual/androidRRO/res/values-w1280dp/dimens.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/values-w1920dp/dimens.xml b/car_product/rro/overlay-visual/androidRRO/res/values-w1920dp/dimens.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/values-w1920dp/dimens.xml
rename to car_product/rro/overlay-visual/androidRRO/res/values-w1920dp/dimens.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/values-w690dp/dimens.xml b/car_product/rro/overlay-visual/androidRRO/res/values-w690dp/dimens.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/values-w690dp/dimens.xml
rename to car_product/rro/overlay-visual/androidRRO/res/values-w690dp/dimens.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/values-w840dp/dimens.xml b/car_product/rro/overlay-visual/androidRRO/res/values-w840dp/dimens.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/values-w840dp/dimens.xml
rename to car_product/rro/overlay-visual/androidRRO/res/values-w840dp/dimens.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/values/attrs.xml b/car_product/rro/overlay-visual/androidRRO/res/values/attrs.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/values/attrs.xml
rename to car_product/rro/overlay-visual/androidRRO/res/values/attrs.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/values/colors.xml b/car_product/rro/overlay-visual/androidRRO/res/values/colors.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/values/colors.xml
rename to car_product/rro/overlay-visual/androidRRO/res/values/colors.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/values/colors_device_defaults.xml b/car_product/rro/overlay-visual/androidRRO/res/values/colors_device_defaults.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/values/colors_device_defaults.xml
rename to car_product/rro/overlay-visual/androidRRO/res/values/colors_device_defaults.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/values/dimens.xml b/car_product/rro/overlay-visual/androidRRO/res/values/dimens.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/values/dimens.xml
rename to car_product/rro/overlay-visual/androidRRO/res/values/dimens.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/values/styles.xml b/car_product/rro/overlay-visual/androidRRO/res/values/styles.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/values/styles.xml
rename to car_product/rro/overlay-visual/androidRRO/res/values/styles.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/values/styles_device_default.xml b/car_product/rro/overlay-visual/androidRRO/res/values/styles_device_default.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/values/styles_device_default.xml
rename to car_product/rro/overlay-visual/androidRRO/res/values/styles_device_default.xml
diff --git a/car_product/overlay-visual/frameworks/base/core/res/res/values/themes_device_defaults.xml b/car_product/rro/overlay-visual/androidRRO/res/values/themes_device_defaults.xml
similarity index 100%
rename from car_product/overlay-visual/frameworks/base/core/res/res/values/themes_device_defaults.xml
rename to car_product/rro/overlay-visual/androidRRO/res/values/themes_device_defaults.xml
