sdm660-common: rro_overlay: rename all overlays to avoid conflicts

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,
+}

rro_overlay/SDM660CarrierConfigOverlay/AndroidManifest.xml

@@ -11,7 +11,7 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.carrierconfig.overlay">
+    package="com.android.carrierconfig.overlay.sdm660">
 
     <application android:hasCode="false" />
     <overlay

rro_overlay/SDM660DialerOverlay/Android.bp

@@ -15,7 +15,7 @@
 //
 
 runtime_resource_overlay {
-    name: "SystemUIOverlay",
+    name: "SDM660DialerOverlay",
     resource_dirs: ["res"],
     vendor: true,
 }

rro_overlay/SDM660DialerOverlay/AndroidManifest.xml

@@ -11,7 +11,7 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.dialer.overlay">
+    package="com.android.dialer.overlay.sdm660">
 
     <application android:hasCode="false" />
     <overlay

rro_overlay/SDM660FrameworksOverlay/Android.bp

@@ -15,7 +15,7 @@
 //
 
 runtime_resource_overlay {
-    name: "SettingsOverlay",
+    name: "SDM660FrameworksOverlay",
     resource_dirs: ["res"],
     vendor: true,
 }

rro_overlay/SDM660FrameworksOverlay/AndroidManifest.xml

@@ -11,7 +11,7 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.frameworks.overlay">
+    package="com.android.frameworks.overlay.sdm660">
 
     <application android:hasCode="false" />
     <overlay

rro_overlay/SDM660SettingsOverlay/Android.bp

@@ -15,7 +15,7 @@
 //
 
 runtime_resource_overlay {
-    name: "CarrierConfigOverlay",
+    name: "SDM660SettingsOverlay",
     resource_dirs: ["res"],
     vendor: true,
 }

rro_overlay/SDM660SettingsOverlay/AndroidManifest.xml

@@ -11,7 +11,7 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.settings.overlay">
+    package="com.android.settings.overlay.sdm660">
 
     <application android:hasCode="false" />
     <overlay

rro_overlay/SDM660SettingsProviderOverlay/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: "SDM660SettingsProviderOverlay",
+    resource_dirs: ["res"],
+    vendor: true,
+}

rro_overlay/SDM660SettingsProviderOverlay/AndroidManifest.xml

@@ -11,7 +11,7 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.settingsprovider.overlay">
+    package="com.android.settingsprovider.overlay.sdm660">
 
     <application android:hasCode="false" />
     <overlay

rro_overlay/SDM660SystemUIOverlay/Android.bp

@@ -15,7 +15,7 @@
 //
 
 runtime_resource_overlay {
-    name: "FrameworksOverlay",
+    name: "SDM660SystemUIOverlay",
     resource_dirs: ["res"],
     vendor: true,
 }

rro_overlay/SDM660SystemUIOverlay/AndroidManifest.xml

@@ -11,7 +11,7 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.systemui.overlay">
+    package="com.android.systemui.overlay.sdm660">
 
     <application android:hasCode="false" />
     <overlay

rro_overlay/SDM660TelephonyOverlay/Android.bp

@@ -15,7 +15,7 @@
 //
 
 runtime_resource_overlay {
-    name: "DialerOverlay",
+    name: "SDM660TelephonyOverlay",
     resource_dirs: ["res"],
     vendor: true,
 }

rro_overlay/SDM660TelephonyOverlay/AndroidManifest.xml

@@ -11,7 +11,7 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.phone.overlay">
+    package="com.android.phone.overlay.sdm660">
 
     <application android:hasCode="false" />
     <overlay

rro_overlay/SDM660WifiOverlay/Android.bp

@@ -1,5 +1,5 @@
 runtime_resource_overlay {
-    name: "WifiOverlay",
+    name: "SDM660WifiOverlay",
     resource_dirs: ["res"],
     proprietary: true
 }

rro_overlay/SDM660WifiOverlay/AndroidManifest.xml

@@ -16,7 +16,7 @@
 <!-- Pixel specific wifi overlays -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     coreApp="true"
-    package="com.android.wifi.resources.xiaomi_sdm660"
+    package="com.android.wifi.resources.sdm660"
     android:versionCode="1"
     android:versionName="1.0">
     <application android:hasCode="false" />

rro_overlay/SettingsProviderOverlay/Android.bp

@@ -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,
-}

rro_overlay/TelephonyOverlay/Android.bp

@@ -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,
-}

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