zenfone7: Move Overlay to RRO
Change-Id: Ib10ef8a07bcea213bf406b638eb892a73aa8958f
diff --git a/FrameworksResOverlay/Android.mk b/FrameworksResOverlay/Android.mk
deleted file mode 100644
index 2aa141d..0000000
--- a/FrameworksResOverlay/Android.mk
+++ /dev/null
@@ -1,8 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-LOCAL_MODULE_TAGS := optional
-LOCAL_PACKAGE_NAME := FrameworksResOverlay
-LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT)/overlay
-LOCAL_IS_RUNTIME_RESOURCE_OVERLAY := true
-LOCAL_PRIVATE_PLATFORM_APIS := true
-include $(BUILD_PACKAGE)
\ No newline at end of file
diff --git a/FrameworksResOverlay/res/values/arrays.xml b/FrameworksResOverlay/res/values/arrays.xml
deleted file mode 100644
index 30acea8..0000000
--- a/FrameworksResOverlay/res/values/arrays.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <!-- List supported color modes. -->
- <integer-array name="config_availableColorModes">
- <item>0</item> <!-- COLOR_MODE_NATURAL -->
- <item>1</item> <!-- COLOR_MODE_BOOSTED -->
- <item>3</item> <!-- COLOR_MODE_AUTOMATIC -->
- </integer-array>
-</resources>
diff --git a/FrameworksResOverlay/res/values/integers.xml b/FrameworksResOverlay/res/values/integers.xml
deleted file mode 100644
index 3a74448..0000000
--- a/FrameworksResOverlay/res/values/integers.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <!-- The default peak refresh rate for a given device. Change this value if you want to prevent
- the framework from using higher refresh rates, even if display modes with higher refresh
- rates are available from hardware composer. Only has an effect if the value is
- non-zero. -->
- <integer name="config_defaultPeakRefreshRate">90</integer>
-</resources>
diff --git a/device.mk b/device.mk
index 1feb5e9..faa945a 100755
--- a/device.mk
+++ b/device.mk
@@ -27,6 +27,11 @@
DEVICE_PACKAGE_OVERLAYS += \
$(LOCAL_PATH)/overlay
+PRODUCT_PACKAGES += \
+ FrameworksResDeviceOverlay \
+ FrameworksResVendorOverlay \
+ SystemUIDeviceOverlay
+
# Api
PRODUCT_SHIPPING_API_LEVEL := 29
@@ -40,10 +45,6 @@
PRODUCT_PACKAGES += \
CameraTile
-# Frameworks
-PRODUCT_PACKAGES += \
- FrameworksResOverlay
-
# Input
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/idc/fts_ts.idc:system/usr/idc/fts_ts.idc \
diff --git a/rro_overlays/FrameworksResOverlay/Android.bp b/rro_overlays/FrameworksResOverlay/Android.bp
new file mode 100644
index 0000000..3869a34
--- /dev/null
+++ b/rro_overlays/FrameworksResOverlay/Android.bp
@@ -0,0 +1,5 @@
+runtime_resource_overlay {
+ name: "FrameworksResDeviceOverlay",
+ sdk_version: "current",
+ product_specific: true,
+}
diff --git a/FrameworksResOverlay/AndroidManifest.xml b/rro_overlays/FrameworksResOverlay/AndroidManifest.xml
similarity index 82%
rename from FrameworksResOverlay/AndroidManifest.xml
rename to rro_overlays/FrameworksResOverlay/AndroidManifest.xml
index fbdbd31..9ebfdc3 100644
--- a/FrameworksResOverlay/AndroidManifest.xml
+++ b/rro_overlays/FrameworksResOverlay/AndroidManifest.xml
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="android.frameworks.overlay"
+ package="android.frameworks.device.overlay"
android:versionCode="1"
android:versionName="1.0">
<overlay android:isStatic="true" android:priority="140" android:targetPackage="android"/>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/rro_overlays/FrameworksResOverlay/res/values/config.xml
similarity index 100%
rename from overlay/frameworks/base/core/res/res/values/config.xml
rename to rro_overlays/FrameworksResOverlay/res/values/config.xml
diff --git a/rro_overlays/FrameworksResVendor/Android.bp b/rro_overlays/FrameworksResVendor/Android.bp
new file mode 100644
index 0000000..3a9ff85
--- /dev/null
+++ b/rro_overlays/FrameworksResVendor/Android.bp
@@ -0,0 +1,21 @@
+//
+// Copyright (C) 2020 The Android Open-Source Project
+//
+// 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: "FrameworksResVendorOverlay",
+ sdk_version: "current",
+ product_specific: true,
+}
diff --git a/rro_overlays/FrameworksResVendor/AndroidManifest.xml b/rro_overlays/FrameworksResVendor/AndroidManifest.xml
new file mode 100644
index 0000000..c06e334
--- /dev/null
+++ b/rro_overlays/FrameworksResVendor/AndroidManifest.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 The OmniRom Project
+ SPDX-License-Identifier: Apache-2.0
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="android.overlay.target">
+
+ <overlay
+ android:isStatic="true"
+ android:priority="800"
+ android:targetPackage="android" />
+</manifest>
diff --git a/rro_overlays/FrameworksResVendor/res/values/config.xml b/rro_overlays/FrameworksResVendor/res/values/config.xml
new file mode 100644
index 0000000..17c41e4
--- /dev/null
+++ b/rro_overlays/FrameworksResVendor/res/values/config.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <!-- List supported color modes. -->
+ <integer-array name="config_availableColorModes">
+ <item>0</item> <!-- COLOR_MODE_NATURAL -->
+ <item>1</item> <!-- COLOR_MODE_BOOSTED -->
+ <item>3</item> <!-- COLOR_MODE_AUTOMATIC -->
+ </integer-array>
+
+ <!-- The default peak refresh rate for a given device. Change this value if you want to prevent
+ the framework from using higher refresh rates, even if display modes with higher refresh
+ rates are available from hardware composer. Only has an effect if the value is
+ non-zero. -->
+ <integer name="config_defaultPeakRefreshRate">90</integer>
+
+ <!-- Whether the always on display mode is available. -->
+ <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
+
+ <!-- Control whether the always on display mode is enabled by default. This value will be used
+ during initialization when the setting is still null. -->
+ <bool name="config_dozeAlwaysOnEnabled">false</bool>
+
+</resources>
diff --git a/rro_overlays/FrameworksResVendor/res/xml/power_profile.xml b/rro_overlays/FrameworksResVendor/res/xml/power_profile.xml
new file mode 100644
index 0000000..1e4a9f7
--- /dev/null
+++ b/rro_overlays/FrameworksResVendor/res/xml/power_profile.xml
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="utf-8"?>
+<device name="Android">
+ <item name="none">0</item>
+ <item name="battery.capacity">5000</item>
+ <array name="cpu.clusters.cores">
+ <value>4</value>
+ <value>3</value>
+ <value>1</value>
+ </array>
+ <item name="cpu.suspend">5.6</item>
+ <item name="cpu.idle">5.4</item>
+ <item name="cpu.active">8.4</item>
+ <item name="cpu.cluster_power.cluster0">2</item>
+ <item name="cpu.cluster_power.cluster1">2.2</item>
+ <item name="cpu.cluster_power.cluster2">2.6</item>
+ <array name="cpu.core_speeds.cluster0">
+ <value>300000</value>
+ <value>403200</value>
+ <value>518400</value>
+ <value>614400</value>
+ <value>691200</value>
+ <value>787200</value>
+ <value>883200</value>
+ <value>979200</value>
+ <value>1075200</value>
+ <value>1171200</value>
+ <value>1248000</value>
+ <value>1344000</value>
+ <value>1420800</value>
+ <value>1516800</value>
+ <value>1612800</value>
+ <value>1708800</value>
+ <value>1804800</value>
+ </array>
+ <array name="cpu.core_speeds.cluster1">
+ <value>710400</value>
+ <value>825600</value>
+ <value>940800</value>
+ <value>1056000</value>
+ <value>1171200</value>
+ <value>1286400</value>
+ <value>1382400</value>
+ <value>1478400</value>
+ <value>1574400</value>
+ <value>1670400</value>
+ <value>1766400</value>
+ <value>1862400</value>
+ <value>1958400</value>
+ <value>2054400</value>
+ <value>2150400</value>
+ <value>2246400</value>
+ <value>2342400</value>
+ <value>2419200</value>
+ </array>
+ <array name="cpu.core_speeds.cluster2">
+ <value>844800</value>
+ <value>960000</value>
+ <value>1075200</value>
+ <value>1190400</value>
+ <value>1305600</value>
+ <value>1401600</value>
+ <value>1516800</value>
+ <value>1632000</value>
+ <value>1747200</value>
+ <value>1862400</value>
+ <value>1977600</value>
+ <value>2073600</value>
+ <value>2169600</value>
+ <value>2265600</value>
+ <value>2361600</value>
+ <value>2457600</value>
+ <value>2553600</value>
+ <value>2649600</value>
+ <value>2745600</value>
+ <value>2841600</value>
+ </array>
+ <array name="cpu.core_power.cluster0">
+ <value>39.44</value>
+ <value>41.34</value>
+ <value>45.48</value>
+ <value>47.20</value>
+ <value>49.64</value>
+ <value>51.88</value>
+ <value>53.34</value>
+ <value>56.69</value>
+ <value>58.78</value>
+ <value>61.41</value>
+ <value>65.11</value>
+ <value>67.49</value>
+ <value>70.61</value>
+ <value>72.39</value>
+ <value>75.43</value>
+ <value>80.21</value>
+ <value>85.05</value>
+ </array>
+ <array name="cpu.core_power.cluster1">
+ <value>50.35</value>
+ <value>55.12</value>
+ <value>61.45</value>
+ <value>69.92</value>
+ <value>77.48</value>
+ <value>85.35</value>
+ <value>95.17</value>
+ <value>103.26</value>
+ <value>110.15</value>
+ <value>118.19</value>
+ <value>132.72</value>
+ <value>143.83</value>
+ <value>155.91</value>
+ <value>190.16</value>
+ <value>213.11</value>
+ <value>237.96</value>
+ <value>266.97</value>
+ <value>302.04</value>
+ </array>
+ <array name="cpu.core_power.cluster2">
+ <value>165.12</value>
+ <value>180.25</value>
+ <value>195.32</value>
+ <value>211.98</value>
+ <value>229.88</value>
+ <value>246.47</value>
+ <value>260.67</value>
+ <value>277.05</value>
+ <value>293.71</value>
+ <value>306.20</value>
+ <value>323.17</value>
+ <value>352.99</value>
+ <value>369.84</value>
+ <value>383.75</value>
+ <value>398.60</value>
+ <value>415.34</value>
+ <value>430.81</value>
+ <value>448.63</value>
+ <value>466.27</value>
+ <value>498.56</value>
+ </array>
+ <item name="ambient.on">42</item>
+ <item name="screen.on">123</item>
+ <item name="screen.full">453</item>
+ <item name="camera.flashlight">300</item>
+ <item name="camera.avg">669</item>
+ <item name="video">25</item>
+ <item name="audio">75</item>
+ <item name="wifi.on">0.1</item>
+ <item name="wifi.active">168</item>
+ <item name="wifi.scan">1.3</item>
+ <item name="dsp.audio">24</item>
+ <item name="dsp.video">63</item>
+ <item name="modem.controller.sleep">0</item>
+ <item name="modem.controller.idle">6</item>
+ <item name="modem.controller.rx">180</item>
+ <array name="modem.controller.tx">
+ <value>96</value>
+ <value>133</value>
+ <value>183</value>
+ <value>225</value>
+ <value>295</value>
+ </array>
+ <item name="modem.controller.voltage">3700</item>
+ <array name="memory.bandwidths">
+ <value>17</value>
+ </array>
+ <item name="radio.active">168</item>
+ <item name="radio.scanning">6</item>
+ <array name="radio.on">
+ <value>88</value>
+ <value>8</value>
+ </array>
+ <item name="gps.on">10</item>
+ <array name="gps.signalqualitybased">
+ <value>24</value>
+ <value>6</value>
+ </array>
+ <item name="gps.voltage">3700</item>
+ <item name="wifi.controller.idle">1</item>
+ <item name="wifi.controller.rx">152</item>
+ <item name="wifi.controller.tx">190</item>
+ <array name="wifi.controller.tx_levels">1 </array>
+ <item name="wifi.controller.voltage">3700</item>
+ <array name="wifi.batchedscan">
+ <value>.0001</value>
+ <value>.001</value>
+ <value>.01</value>
+ <value>.1</value>
+ <value>1</value>
+ </array>
+ <item name="bluetooth.active">135</item>
+ <item name="bluetooth.on">0.6</item>
+ <item name="bluetooth.controller.idle">0.01</item>
+ <item name="bluetooth.controller.rx">9</item>
+ <item name="bluetooth.controller.tx">7</item>
+ <item name="bluetooth.controller.voltage">3300</item>
+</device>
diff --git a/rro_overlays/SystemUIOverlay/Android.bp b/rro_overlays/SystemUIOverlay/Android.bp
new file mode 100644
index 0000000..1a1db89
--- /dev/null
+++ b/rro_overlays/SystemUIOverlay/Android.bp
@@ -0,0 +1,5 @@
+runtime_resource_overlay {
+ name: "SystemUIDeviceOverlay",
+ sdk_version: "current",
+ product_specific: true,
+}
diff --git a/rro_overlays/SystemUIOverlay/AndroidManifest.xml b/rro_overlays/SystemUIOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..4e56b14
--- /dev/null
+++ b/rro_overlays/SystemUIOverlay/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ package="com.android.systemui.overlay.device">
+
+ <overlay
+ android:isStatic="true"
+ android:priority="550"
+ android:targetPackage="com.android.systemui" />
+</manifest>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/rro_overlays/SystemUIOverlay/res/values/dimens.xml
similarity index 100%
rename from overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
rename to rro_overlays/SystemUIOverlay/res/values/dimens.xml