Skip to content

Commit

Permalink
r5x: Convert overlays to rro_overlay
Browse files Browse the repository at this point in the history
  • Loading branch information
takumi021 committed Dec 12, 2022
1 parent 9c1628d commit ae4b128
Show file tree
Hide file tree
Showing 38 changed files with 147 additions and 101 deletions.
21 changes: 12 additions & 9 deletions device.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
# RealmeDirac
$(call inherit-product, $(LOCAL_PATH)/app/RealmeDirac/dirac.mk)

# Overlays
DEVICE_PACKAGE_OVERLAYS += \
$(LOCAL_PATH)/overlay

OVERRIDE_PRODUCT_COMPRESSED_APEX := false

# Soong namespaces
Expand Down Expand Up @@ -340,6 +336,18 @@ PRODUCT_PACKAGES += \
libstagefrighthw \
[email protected]

# Overlays
PRODUCT_PACKAGES += \
CarrierConfigOverlay \
TelephonyOverlay \
SettingsProviderOveray \
SettingsOverlay \
SystemUIOverlay \
WifiOverlay \
FrameworksOverlay \
TetheringCOverlay \
BluetoothOverlay

# Power
PRODUCT_PACKAGES += \
android.hardware.power-service.r5x-libperfmgr \
Expand Down Expand Up @@ -429,10 +437,6 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.sensor.proximity.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.proximity.xml \
frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.stepcounter.xml

# Tethering
PRODUCT_PACKAGES += \
TetheringConfigOverlay

# Tetheroffload
PRODUCT_PACKAGES += \
ipacm \
Expand Down Expand Up @@ -468,7 +472,6 @@ PRODUCT_PACKAGES += \
libwifi-hal-ctrl \
libwifi-hal-qcom \
libwpa_client \
WifiOverlay \
wpa_cli \
wpa_supplicant \
wpa_supplicant.conf \
Expand Down
5 changes: 0 additions & 5 deletions overlay/frameworks/base/core/res/res/values/custom_config.xml

This file was deleted.

25 changes: 0 additions & 25 deletions overlay/frameworks/base/core/res/res/values/strings.xml

This file was deleted.

23 changes: 0 additions & 23 deletions overlay/packages/apps/CellBroadcastReceiver/res/values/config.xml

This file was deleted.

39 changes: 0 additions & 39 deletions overlay/packages/services/Telecomm/res/values/config.xml

This file was deleted.

6 changes: 6 additions & 0 deletions rro_overlay/BluetoothOverlay/Andoroid.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
runtime_resource_overlay {
name: "BluetoothOverlay",
theme: "BluetoothOverlay",
sdk_version: "current",
vendor: true,
}
6 changes: 6 additions & 0 deletions rro_overlay/BluetoothOverlay/AndoroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
coreApp="true"
package="com.android.bluetooth.overlay.realme_r5x">
<overlay android:targetPackage="com.android.bluetooth" android:targetName="BluetoothCustomization" android:isStatic="true" />
</manifest>
6 changes: 6 additions & 0 deletions rro_overlay/CarrierConfigOverlay/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
runtime_resource_overlay {
name: "CarrierConfigOverlay",
theme: "CarrierConfigOverlay",
sdk_version: "current",
vendor: true,
}
13 changes: 13 additions & 0 deletions rro_overlay/CarrierConfigOverlay/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2022 The PixelExperience Project
SPDX-License-Identifier: Apache-2.0
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.carrierconfig.overlay.realme_r5x">

<overlay
android:isStatic="true"
android:priority="550"
android:targetPackage="com.android.carrierconfig" />
</manifest>
6 changes: 6 additions & 0 deletions rro_overlay/FrameworksOverlay/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
runtime_resource_overlay {
name: "FrameworksOverlay",
theme: "FrameworksOverlay",
sdk_version: "current",
vendor: true,
}
13 changes: 13 additions & 0 deletions rro_overlay/FrameworksOverlay/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2022 The PixelExperience Project
SPDX-License-Identifier: Apache-2.0
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.overlay.realme_r5x">

<overlay
android:isStatic="true"
android:priority="550"
android:targetPackage="android" />
</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -462,4 +462,9 @@

<!-- If this is true, device supports Sustained Performance Mode. -->
<bool name="config_sustainedPerformanceModeSupported">true</bool>

<!-- List of comma separated package names for which we the system will not show crash, ANR,
etc. dialogs. -->
<string name="config_appsNotReportingCrashes">com.google.android.tts</string>

</resources>
6 changes: 6 additions & 0 deletions rro_overlay/SettingsOverlay/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
runtime_resource_overlay {
name: "SettingsOverlay",
theme: "SettingsOverlay",
sdk_version: "current",
vendor: true,
}
13 changes: 13 additions & 0 deletions rro_overlay/SettingsOverlay/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2022 The PixelExperience Project
SPDX-License-Identifier: Apache-2.0
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.settings.overlay.realme_r5x">

<overlay
android:isStatic="true"
android:priority="550"
android:targetPackage="com.android.settings" />
</manifest>
6 changes: 6 additions & 0 deletions rro_overlay/SettingsProviderOverlay/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
runtime_resource_overlay {
name: "SettingsProviderOverlay",
theme: "SettingsProviderOverlay",
sdk_version: "current",
vendor: true,
}
13 changes: 13 additions & 0 deletions rro_overlay/SettingsProviderOverlay/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2022 The PixelExperience Project
SPDX-License-Identifier: Apache-2.0
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.settingsprovider.overlay.realme_r5x">

<overlay
android:isStatic="true"
android:priority="550"
android:targetPackage="com.android.providers.settings" />
</manifest>
6 changes: 6 additions & 0 deletions rro_overlay/SystemUIOverlay/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
runtime_resource_overlay {
name: "SystemUIOverlay",
theme: "SystemUIOverlay",
sdk_version: "current",
vendor: true,
}
13 changes: 13 additions & 0 deletions rro_overlay/SystemUIOverlay/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2022 The PixelExperience Project
SPDX-License-Identifier: Apache-2.0
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.systemui.overlay.realme_r5x">

<overlay
android:isStatic="true"
android:priority="550"
android:targetPackage="com.android.systemui" />
</manifest>
6 changes: 6 additions & 0 deletions rro_overlay/TelephonyOverlay/Android.bp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
runtime_resource_overlay {
name: "TelephonyOverlay",
theme: "TelephonyOverlay",
sdk_version: "current",
vendor: true,
}
13 changes: 13 additions & 0 deletions rro_overlay/TelephonyOverlay/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2022 The PixelExperience Project
SPDX-License-Identifier: Apache-2.0
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.phone.overlay.realme_r5x">

<overlay
android:isStatic="true"
android:priority="550"
android:targetPackage="com.android.phone" />
</manifest>
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,8 @@

<!-- integer indicating additional disconnect delay (in ms) after IMS onLost() indication is received -->
<integer translatable="false" name="config_wifiDelayDisconnectOnImsLostMs">1000</integer>

<!-- Do not translate. Default access point SSID used for tethering -->
<string name="wifi_tether_configure_ssid_default" translatable="false">Realme 5 Series</string>

</resources>

0 comments on commit ae4b128

Please sign in to comment.