diff --git a/common.mk b/common.mk index 63c091e..4682d2b 100644 --- a/common.mk +++ b/common.mk @@ -362,17 +362,17 @@ $(foreach sku_out, $(TARGET_COPY_OUT_NFC_SKU_PERMISSIONS), \ # Overlays PRODUCT_PACKAGES += \ - CarrierConfigResCommon_Sys \ - FrameworksResCommon_Sys \ - SettingsResCommon_Sys \ - SystemUIResCommon_Sys \ - TelecommResCommon_Sys \ - TelephonyResCommon_Sys \ - WifiResCommon_Sys + CarrierConfigResCommon \ + FrameworksResCommon \ + SettingsResCommon \ + SystemUIResCommon \ + TelecommResCommon \ + TelephonyResCommon \ + WifiResCommon PRODUCT_PACKAGES += \ DialerResXiaomi \ - FrameworksResTarget_Vendor \ + FrameworksResTarget \ FrameworksResXiaomi \ SettingsProviderResXiaomi \ SettingsResXiaomi \ diff --git a/overlay/CarrierConfigResCommon_Sys/Android.bp b/overlay/CarrierConfigResCommon/Android.bp similarity index 82% rename from overlay/CarrierConfigResCommon_Sys/Android.bp rename to overlay/CarrierConfigResCommon/Android.bp index be8d643..0a631a6 100644 --- a/overlay/CarrierConfigResCommon_Sys/Android.bp +++ b/overlay/CarrierConfigResCommon/Android.bp @@ -5,7 +5,7 @@ // runtime_resource_overlay { - name: "CarrierConfigResCommon_Sys", + name: "CarrierConfigResCommon", product_specific: true, aaptflags: ["--keep-raw-values"], } diff --git a/overlay/CarrierConfigResCommon_Sys/AndroidManifest.xml b/overlay/CarrierConfigResCommon/AndroidManifest.xml similarity index 100% rename from overlay/CarrierConfigResCommon_Sys/AndroidManifest.xml rename to overlay/CarrierConfigResCommon/AndroidManifest.xml diff --git a/overlay/CarrierConfigResCommon_Sys/res/xml/vendor.xml b/overlay/CarrierConfigResCommon/res/xml/vendor.xml similarity index 100% rename from overlay/CarrierConfigResCommon_Sys/res/xml/vendor.xml rename to overlay/CarrierConfigResCommon/res/xml/vendor.xml diff --git a/overlay/SystemUIResCommon_Sys/Android.bp b/overlay/FrameworksResCommon/Android.bp similarity index 81% rename from overlay/SystemUIResCommon_Sys/Android.bp rename to overlay/FrameworksResCommon/Android.bp index 2120988..fa9e81a 100644 --- a/overlay/SystemUIResCommon_Sys/Android.bp +++ b/overlay/FrameworksResCommon/Android.bp @@ -5,6 +5,6 @@ // runtime_resource_overlay { - name: "SystemUIResCommon_Sys", + name: "FrameworksResCommon", product_specific: true, } diff --git a/overlay/FrameworksResCommon_Sys/AndroidManifest.xml b/overlay/FrameworksResCommon/AndroidManifest.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/AndroidManifest.xml rename to overlay/FrameworksResCommon/AndroidManifest.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values-mcc234-mnc15/config.xml b/overlay/FrameworksResCommon/res/values-mcc234-mnc15/config.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values-mcc234-mnc15/config.xml rename to overlay/FrameworksResCommon/res/values-mcc234-mnc15/config.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc2/config.xml b/overlay/FrameworksResCommon/res/values-mcc262-mnc2/config.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc2/config.xml rename to overlay/FrameworksResCommon/res/values-mcc262-mnc2/config.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc4/config.xml b/overlay/FrameworksResCommon/res/values-mcc262-mnc4/config.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc4/config.xml rename to overlay/FrameworksResCommon/res/values-mcc262-mnc4/config.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc9/config.xml b/overlay/FrameworksResCommon/res/values-mcc262-mnc9/config.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values-mcc262-mnc9/config.xml rename to overlay/FrameworksResCommon/res/values-mcc262-mnc9/config.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc120/config.xml b/overlay/FrameworksResCommon/res/values-mcc310-mnc120/config.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc120/config.xml rename to overlay/FrameworksResCommon/res/values-mcc310-mnc120/config.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc260/config.xml b/overlay/FrameworksResCommon/res/values-mcc310-mnc260/config.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc260/config.xml rename to overlay/FrameworksResCommon/res/values-mcc310-mnc260/config.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc4/config.xml b/overlay/FrameworksResCommon/res/values-mcc310-mnc4/config.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc4/config.xml rename to overlay/FrameworksResCommon/res/values-mcc310-mnc4/config.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc410/config.xml b/overlay/FrameworksResCommon/res/values-mcc310-mnc410/config.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values-mcc310-mnc410/config.xml rename to overlay/FrameworksResCommon/res/values-mcc310-mnc410/config.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values-mcc311-mnc480/config.xml b/overlay/FrameworksResCommon/res/values-mcc311-mnc480/config.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values-mcc311-mnc480/config.xml rename to overlay/FrameworksResCommon/res/values-mcc311-mnc480/config.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values-mcc454-mnc3/bools.xml b/overlay/FrameworksResCommon/res/values-mcc454-mnc3/bools.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values-mcc454-mnc3/bools.xml rename to overlay/FrameworksResCommon/res/values-mcc454-mnc3/bools.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values-mcc454-mnc4/bools.xml b/overlay/FrameworksResCommon/res/values-mcc454-mnc4/bools.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values-mcc454-mnc4/bools.xml rename to overlay/FrameworksResCommon/res/values-mcc454-mnc4/bools.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values-mcc455-mnc2/bools.xml b/overlay/FrameworksResCommon/res/values-mcc455-mnc2/bools.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values-mcc455-mnc2/bools.xml rename to overlay/FrameworksResCommon/res/values-mcc455-mnc2/bools.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values-mcc455-mnc7/bools.xml b/overlay/FrameworksResCommon/res/values-mcc455-mnc7/bools.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values-mcc455-mnc7/bools.xml rename to overlay/FrameworksResCommon/res/values-mcc455-mnc7/bools.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc11/bools.xml b/overlay/FrameworksResCommon/res/values-mcc460-mnc11/bools.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc11/bools.xml rename to overlay/FrameworksResCommon/res/values-mcc460-mnc11/bools.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc11/config.xml b/overlay/FrameworksResCommon/res/values-mcc460-mnc11/config.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc11/config.xml rename to overlay/FrameworksResCommon/res/values-mcc460-mnc11/config.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc3/bools.xml b/overlay/FrameworksResCommon/res/values-mcc460-mnc3/bools.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc3/bools.xml rename to overlay/FrameworksResCommon/res/values-mcc460-mnc3/bools.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc3/config.xml b/overlay/FrameworksResCommon/res/values-mcc460-mnc3/config.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values-mcc460-mnc3/config.xml rename to overlay/FrameworksResCommon/res/values-mcc460-mnc3/config.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values/bools.xml b/overlay/FrameworksResCommon/res/values/bools.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values/bools.xml rename to overlay/FrameworksResCommon/res/values/bools.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values/config.xml b/overlay/FrameworksResCommon/res/values/config.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values/config.xml rename to overlay/FrameworksResCommon/res/values/config.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values/config_telephony.xml b/overlay/FrameworksResCommon/res/values/config_telephony.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values/config_telephony.xml rename to overlay/FrameworksResCommon/res/values/config_telephony.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values/required_apps_managed_device.xml b/overlay/FrameworksResCommon/res/values/required_apps_managed_device.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values/required_apps_managed_device.xml rename to overlay/FrameworksResCommon/res/values/required_apps_managed_device.xml diff --git a/overlay/FrameworksResCommon_Sys/res/values/strings.xml b/overlay/FrameworksResCommon/res/values/strings.xml similarity index 100% rename from overlay/FrameworksResCommon_Sys/res/values/strings.xml rename to overlay/FrameworksResCommon/res/values/strings.xml diff --git a/overlay/FrameworksResCommon_Sys/Android.bp b/overlay/FrameworksResCommon_Sys/Android.bp deleted file mode 100644 index e2491b8..0000000 --- a/overlay/FrameworksResCommon_Sys/Android.bp +++ /dev/null @@ -1,10 +0,0 @@ -// -// Copyright (C) 2024 The LineageOS Project -// -// SPDX-License-Identifier: Apache-2.0 -// - -runtime_resource_overlay { - name: "FrameworksResCommon_Sys", - product_specific: true, -} diff --git a/overlay/FrameworksResTarget_Vendor/Android.bp b/overlay/FrameworksResTarget/Android.bp similarity index 77% rename from overlay/FrameworksResTarget_Vendor/Android.bp rename to overlay/FrameworksResTarget/Android.bp index c4107ae..f740d00 100644 --- a/overlay/FrameworksResTarget_Vendor/Android.bp +++ b/overlay/FrameworksResTarget/Android.bp @@ -5,6 +5,6 @@ // runtime_resource_overlay { - name: "FrameworksResTarget_Vendor", + name: "FrameworksResTarget", vendor: true, } diff --git a/overlay/FrameworksResTarget_Vendor/AndroidManifest.xml b/overlay/FrameworksResTarget/AndroidManifest.xml similarity index 100% rename from overlay/FrameworksResTarget_Vendor/AndroidManifest.xml rename to overlay/FrameworksResTarget/AndroidManifest.xml diff --git a/overlay/FrameworksResTarget_Vendor/res/values/config.xml b/overlay/FrameworksResTarget/res/values/config.xml similarity index 100% rename from overlay/FrameworksResTarget_Vendor/res/values/config.xml rename to overlay/FrameworksResTarget/res/values/config.xml diff --git a/overlay/FrameworksResTarget_Vendor/res/values/dimens.xml b/overlay/FrameworksResTarget/res/values/dimens.xml similarity index 100% rename from overlay/FrameworksResTarget_Vendor/res/values/dimens.xml rename to overlay/FrameworksResTarget/res/values/dimens.xml diff --git a/overlay/FrameworksResTarget_Vendor/res/xml/power_profile.xml b/overlay/FrameworksResTarget/res/xml/power_profile.xml similarity index 100% rename from overlay/FrameworksResTarget_Vendor/res/xml/power_profile.xml rename to overlay/FrameworksResTarget/res/xml/power_profile.xml diff --git a/overlay/WifiResCommon_Sys/Android.bp b/overlay/SettingsResCommon/Android.bp similarity index 82% rename from overlay/WifiResCommon_Sys/Android.bp rename to overlay/SettingsResCommon/Android.bp index 15bc0b6..8142c67 100644 --- a/overlay/WifiResCommon_Sys/Android.bp +++ b/overlay/SettingsResCommon/Android.bp @@ -5,6 +5,6 @@ // runtime_resource_overlay { - name: "WifiResCommon_Sys", + name: "SettingsResCommon", product_specific: true, } diff --git a/overlay/SettingsResCommon_Sys/AndroidManifest.xml b/overlay/SettingsResCommon/AndroidManifest.xml similarity index 100% rename from overlay/SettingsResCommon_Sys/AndroidManifest.xml rename to overlay/SettingsResCommon/AndroidManifest.xml diff --git a/overlay/SettingsResCommon_Sys/res/values/config.xml b/overlay/SettingsResCommon/res/values/config.xml similarity index 100% rename from overlay/SettingsResCommon_Sys/res/values/config.xml rename to overlay/SettingsResCommon/res/values/config.xml diff --git a/overlay/SettingsResCommon_Sys/res/values/strings.xml b/overlay/SettingsResCommon/res/values/strings.xml similarity index 100% rename from overlay/SettingsResCommon_Sys/res/values/strings.xml rename to overlay/SettingsResCommon/res/values/strings.xml diff --git a/overlay/TelecommResCommon_Sys/Android.bp b/overlay/SystemUIResCommon/Android.bp similarity index 81% rename from overlay/TelecommResCommon_Sys/Android.bp rename to overlay/SystemUIResCommon/Android.bp index 0d5ed49..f16adeb 100644 --- a/overlay/TelecommResCommon_Sys/Android.bp +++ b/overlay/SystemUIResCommon/Android.bp @@ -5,6 +5,6 @@ // runtime_resource_overlay { - name: "TelecommResCommon_Sys", + name: "SystemUIResCommon", product_specific: true, } diff --git a/overlay/SystemUIResCommon_Sys/AndroidManifest.xml b/overlay/SystemUIResCommon/AndroidManifest.xml similarity index 100% rename from overlay/SystemUIResCommon_Sys/AndroidManifest.xml rename to overlay/SystemUIResCommon/AndroidManifest.xml diff --git a/overlay/SystemUIResCommon_Sys/res/values/config.xml b/overlay/SystemUIResCommon/res/values/config.xml similarity index 100% rename from overlay/SystemUIResCommon_Sys/res/values/config.xml rename to overlay/SystemUIResCommon/res/values/config.xml diff --git a/overlay/SettingsResCommon_Sys/Android.bp b/overlay/TelecommResCommon/Android.bp similarity index 81% rename from overlay/SettingsResCommon_Sys/Android.bp rename to overlay/TelecommResCommon/Android.bp index fb3a7fc..baf1842 100644 --- a/overlay/SettingsResCommon_Sys/Android.bp +++ b/overlay/TelecommResCommon/Android.bp @@ -5,6 +5,6 @@ // runtime_resource_overlay { - name: "SettingsResCommon_Sys", + name: "TelecommResCommon", product_specific: true, } diff --git a/overlay/TelecommResCommon_Sys/AndroidManifest.xml b/overlay/TelecommResCommon/AndroidManifest.xml similarity index 100% rename from overlay/TelecommResCommon_Sys/AndroidManifest.xml rename to overlay/TelecommResCommon/AndroidManifest.xml diff --git a/overlay/TelecommResCommon_Sys/res/values/config.xml b/overlay/TelecommResCommon/res/values/config.xml similarity index 100% rename from overlay/TelecommResCommon_Sys/res/values/config.xml rename to overlay/TelecommResCommon/res/values/config.xml diff --git a/overlay/TelephonyResCommon/Android.bp b/overlay/TelephonyResCommon/Android.bp new file mode 100644 index 0000000..2f9c13f --- /dev/null +++ b/overlay/TelephonyResCommon/Android.bp @@ -0,0 +1,10 @@ +// +// Copyright (C) 2024 The LineageOS Project +// +// SPDX-License-Identifier: Apache-2.0 +// + +runtime_resource_overlay { + name: "TelephonyResCommon", + product_specific: true, +} diff --git a/overlay/TelephonyResCommon_Sys/AndroidManifest.xml b/overlay/TelephonyResCommon/AndroidManifest.xml similarity index 100% rename from overlay/TelephonyResCommon_Sys/AndroidManifest.xml rename to overlay/TelephonyResCommon/AndroidManifest.xml diff --git a/overlay/TelephonyResCommon_Sys/res/values/bools.xml b/overlay/TelephonyResCommon/res/values/bools.xml similarity index 100% rename from overlay/TelephonyResCommon_Sys/res/values/bools.xml rename to overlay/TelephonyResCommon/res/values/bools.xml diff --git a/overlay/TelephonyResCommon_Sys/res/values/config.xml b/overlay/TelephonyResCommon/res/values/config.xml similarity index 100% rename from overlay/TelephonyResCommon_Sys/res/values/config.xml rename to overlay/TelephonyResCommon/res/values/config.xml diff --git a/overlay/TelephonyResCommon_Sys/Android.bp b/overlay/TelephonyResCommon_Sys/Android.bp deleted file mode 100644 index 3e3bf40..0000000 --- a/overlay/TelephonyResCommon_Sys/Android.bp +++ /dev/null @@ -1,10 +0,0 @@ -// -// Copyright (C) 2024 The LineageOS Project -// -// SPDX-License-Identifier: Apache-2.0 -// - -runtime_resource_overlay { - name: "TelephonyResCommon_Sys", - product_specific: true, -} diff --git a/overlay/WifiResCommon/Android.bp b/overlay/WifiResCommon/Android.bp new file mode 100644 index 0000000..740d98d --- /dev/null +++ b/overlay/WifiResCommon/Android.bp @@ -0,0 +1,10 @@ +// +// Copyright (C) 2024 The LineageOS Project +// +// SPDX-License-Identifier: Apache-2.0 +// + +runtime_resource_overlay { + name: "WifiResCommon", + product_specific: true, +} diff --git a/overlay/WifiResCommon_Sys/AndroidManifest.xml b/overlay/WifiResCommon/AndroidManifest.xml similarity index 100% rename from overlay/WifiResCommon_Sys/AndroidManifest.xml rename to overlay/WifiResCommon/AndroidManifest.xml diff --git a/overlay/WifiResCommon_Sys/res/values/bools.xml b/overlay/WifiResCommon/res/values/bools.xml similarity index 100% rename from overlay/WifiResCommon_Sys/res/values/bools.xml rename to overlay/WifiResCommon/res/values/bools.xml diff --git a/overlay/WifiResCommon_Sys/res/values/config.xml b/overlay/WifiResCommon/res/values/config.xml similarity index 100% rename from overlay/WifiResCommon_Sys/res/values/config.xml rename to overlay/WifiResCommon/res/values/config.xml