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