From 7841576d623ca22946c7bbfd2cd2b5f59c87262f Mon Sep 17 00:00:00 2001 From: pix106 Date: Sun, 14 Jan 2024 16:37:26 +0100 Subject: [PATCH] sdm660-common: rro_overlay: rename all overlays to avoid conflicts --- .../SDM660CarrierConfigOverlay/Android.bp | 21 +++++++++++++++++++ .../AndroidManifest.xml | 2 +- .../res/xml/vendor.xml | 0 .../Android.bp | 2 +- .../AndroidManifest.xml | 2 +- .../res/values/config.xml | 0 .../Android.bp | 2 +- .../AndroidManifest.xml | 2 +- .../res/values-mcc234-mnc15-en-rGB/config.xml | 0 .../res/values-mcc234-mnc15-en-rIN/config.xml | 0 .../res/values-mcc234-mnc15/config.xml | 0 .../res/values-mcc262-mnc02-en-rGB/config.xml | 0 .../res/values-mcc262-mnc02-en-rIN/config.xml | 0 .../res/values-mcc262-mnc02/config.xml | 0 .../res/values-mcc262-mnc04-en-rGB/config.xml | 0 .../res/values-mcc262-mnc04-en-rIN/config.xml | 0 .../res/values-mcc262-mnc04/config.xml | 0 .../res/values-mcc262-mnc09-en-rGB/config.xml | 0 .../res/values-mcc262-mnc09-en-rIN/config.xml | 0 .../res/values-mcc262-mnc09/config.xml | 0 .../res/values-mcc310-mnc004/config.xml | 0 .../res/values-mcc310-mnc120/config.xml | 0 .../res/values-mcc310-mnc260/config.xml | 0 .../res/values-mcc310-mnc410/config.xml | 0 .../res/values-mcc311-mnc480/config.xml | 0 .../res/values-mcc312-mnc530/config.xml | 0 .../res/values-mcc313-mnc100/config.xml | 0 .../res/values-mcc460-mnc03/config.xml | 0 .../res/values-mcc460-mnc11/config.xml | 0 .../res/values/arrow_arrays.xml | 0 .../res/values/arrow_config.xml | 0 .../res/values/config.xml | 0 .../res/values/config_telephony.xml | 0 .../res/values/strings.xml | 0 .../Android.bp | 2 +- .../AndroidManifest.xml | 2 +- .../res/values/arrays.xml | 0 .../SDM660SettingsProviderOverlay/Android.bp | 21 +++++++++++++++++++ .../AndroidManifest.xml | 2 +- .../res/values/defaults.xml | 0 .../Android.bp | 2 +- .../AndroidManifest.xml | 2 +- .../res/values-sw600dp/dimens.xml | 0 .../res/values/config.xml | 0 .../res/values/dimens.xml | 0 .../Android.bp | 2 +- .../AndroidManifest.xml | 2 +- .../res/values/config.xml | 0 .../res/values/strings.xml | 0 .../Android.bp | 2 +- .../AndroidManifest.xml | 2 +- .../res/values/config.xml | 0 .../SettingsProviderOverlay/Android.bp | 21 ------------------- rro_overlay/TelephonyOverlay/Android.bp | 21 ------------------- sdm660.mk | 14 ++++++------- 55 files changed, 63 insertions(+), 63 deletions(-) create mode 100644 rro_overlay/SDM660CarrierConfigOverlay/Android.bp rename rro_overlay/{CarrierConfigOverlay => SDM660CarrierConfigOverlay}/AndroidManifest.xml (94%) rename rro_overlay/{CarrierConfigOverlay => SDM660CarrierConfigOverlay}/res/xml/vendor.xml (100%) rename rro_overlay/{SystemUIOverlay => SDM660DialerOverlay}/Android.bp (95%) rename rro_overlay/{DialerOverlay => SDM660DialerOverlay}/AndroidManifest.xml (94%) rename rro_overlay/{DialerOverlay => SDM660DialerOverlay}/res/values/config.xml (100%) rename rro_overlay/{SettingsOverlay => SDM660FrameworksOverlay}/Android.bp (94%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/AndroidManifest.xml (94%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc234-mnc15-en-rGB/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc234-mnc15-en-rIN/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc234-mnc15/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc262-mnc02-en-rGB/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc262-mnc02-en-rIN/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc262-mnc02/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc262-mnc04-en-rGB/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc262-mnc04-en-rIN/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc262-mnc04/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc262-mnc09-en-rGB/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc262-mnc09-en-rIN/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc262-mnc09/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc310-mnc004/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc310-mnc120/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc310-mnc260/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc310-mnc410/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc311-mnc480/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc312-mnc530/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc313-mnc100/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc460-mnc03/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values-mcc460-mnc11/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values/arrow_arrays.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values/arrow_config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values/config.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values/config_telephony.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660FrameworksOverlay}/res/values/strings.xml (100%) rename rro_overlay/{CarrierConfigOverlay => SDM660SettingsOverlay}/Android.bp (95%) rename rro_overlay/{SettingsOverlay => SDM660SettingsOverlay}/AndroidManifest.xml (94%) rename rro_overlay/{SettingsOverlay => SDM660SettingsOverlay}/res/values/arrays.xml (100%) create mode 100644 rro_overlay/SDM660SettingsProviderOverlay/Android.bp rename rro_overlay/{SettingsProviderOverlay => SDM660SettingsProviderOverlay}/AndroidManifest.xml (93%) rename rro_overlay/{SettingsProviderOverlay => SDM660SettingsProviderOverlay}/res/values/defaults.xml (100%) rename rro_overlay/{FrameworksOverlay => SDM660SystemUIOverlay}/Android.bp (95%) rename rro_overlay/{SystemUIOverlay => SDM660SystemUIOverlay}/AndroidManifest.xml (94%) rename rro_overlay/{SystemUIOverlay => SDM660SystemUIOverlay}/res/values-sw600dp/dimens.xml (100%) rename rro_overlay/{SystemUIOverlay => SDM660SystemUIOverlay}/res/values/config.xml (100%) rename rro_overlay/{SystemUIOverlay => SDM660SystemUIOverlay}/res/values/dimens.xml (100%) rename rro_overlay/{DialerOverlay => SDM660TelephonyOverlay}/Android.bp (94%) rename rro_overlay/{TelephonyOverlay => SDM660TelephonyOverlay}/AndroidManifest.xml (94%) rename rro_overlay/{TelephonyOverlay => SDM660TelephonyOverlay}/res/values/config.xml (100%) rename rro_overlay/{TelephonyOverlay => SDM660TelephonyOverlay}/res/values/strings.xml (100%) rename rro_overlay/{WifiOverlay => SDM660WifiOverlay}/Android.bp (71%) rename rro_overlay/{WifiOverlay => SDM660WifiOverlay}/AndroidManifest.xml (95%) rename rro_overlay/{WifiOverlay => SDM660WifiOverlay}/res/values/config.xml (100%) delete mode 100644 rro_overlay/SettingsProviderOverlay/Android.bp delete mode 100644 rro_overlay/TelephonyOverlay/Android.bp diff --git a/rro_overlay/SDM660CarrierConfigOverlay/Android.bp b/rro_overlay/SDM660CarrierConfigOverlay/Android.bp new file mode 100644 index 00000000..e8deac26 --- /dev/null +++ b/rro_overlay/SDM660CarrierConfigOverlay/Android.bp @@ -0,0 +1,21 @@ +// +// Copyright (C) 2022 PixelExperience +// +// 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. +// + +runtime_resource_overlay { + name: "SDM660CarrierConfigOverlay", + resource_dirs: ["res"], + vendor: true, +} diff --git a/rro_overlay/CarrierConfigOverlay/AndroidManifest.xml b/rro_overlay/SDM660CarrierConfigOverlay/AndroidManifest.xml similarity index 94% rename from rro_overlay/CarrierConfigOverlay/AndroidManifest.xml rename to rro_overlay/SDM660CarrierConfigOverlay/AndroidManifest.xml index d3d41315..fb2301f9 100644 --- a/rro_overlay/CarrierConfigOverlay/AndroidManifest.xml +++ b/rro_overlay/SDM660CarrierConfigOverlay/AndroidManifest.xml @@ -11,7 +11,7 @@ limitations under the License. --> + package="com.android.carrierconfig.overlay.sdm660"> + package="com.android.dialer.overlay.sdm660"> + package="com.android.frameworks.overlay.sdm660"> + package="com.android.settings.overlay.sdm660"> + package="com.android.settingsprovider.overlay.sdm660"> + package="com.android.systemui.overlay.sdm660"> + package="com.android.phone.overlay.sdm660"> diff --git a/rro_overlay/WifiOverlay/res/values/config.xml b/rro_overlay/SDM660WifiOverlay/res/values/config.xml similarity index 100% rename from rro_overlay/WifiOverlay/res/values/config.xml rename to rro_overlay/SDM660WifiOverlay/res/values/config.xml diff --git a/rro_overlay/SettingsProviderOverlay/Android.bp b/rro_overlay/SettingsProviderOverlay/Android.bp deleted file mode 100644 index 60cde249..00000000 --- a/rro_overlay/SettingsProviderOverlay/Android.bp +++ /dev/null @@ -1,21 +0,0 @@ -// -// Copyright (C) 2022 PixelExperience -// -// 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. -// - -runtime_resource_overlay { - name: "SettingsProviderOverlay", - resource_dirs: ["res"], - vendor: true, -} diff --git a/rro_overlay/TelephonyOverlay/Android.bp b/rro_overlay/TelephonyOverlay/Android.bp deleted file mode 100644 index 68b19481..00000000 --- a/rro_overlay/TelephonyOverlay/Android.bp +++ /dev/null @@ -1,21 +0,0 @@ -// -// Copyright (C) 2022 PixelExperience -// -// 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. -// - -runtime_resource_overlay { - name: "TelephonyOverlay", - resource_dirs: ["res"], - vendor: true, -} diff --git a/sdm660.mk b/sdm660.mk index fc270eb6..e2d389f3 100644 --- a/sdm660.mk +++ b/sdm660.mk @@ -387,13 +387,13 @@ DEVICE_PACKAGE_OVERLAYS += \ $(COMMON_PATH)/overlay PRODUCT_PACKAGES += \ - CarrierConfigOverlay \ - DialerOverlay \ - FrameworksOverlay \ - SettingsOverlay \ - SettingsProviderOverlay \ - SystemUIOverlay \ - TelephonyOverlay + SDM660CarrierConfigOverlay \ + SDM660DialerOverlay \ + SDM660FrameworksOverlay \ + SDM660SettingsOverlay \ + SDM660SettingsProviderOverlay \ + SDM660SystemUIOverlay \ + SDM660TelephonyOverlay # RRO configuration TARGET_USES_RRO := true