kirin970-common: AICP-ify

Change-Id: Ic50f4deb9a3eed6e7817577c6d4362a0cd552178

9 files changed, 134 insertions, 157 deletions

diff --git a/extract-files.sh b/extract-files.sh
index 7250f1e..ad19c22 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -21,9 +21,9 @@ set -e
 MY_DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
 
-AOSIP_ROOT="$MY_DIR"/../../..
+AICP_ROOT="$MY_DIR"/../../..
 
-HELPER="$AOSIP_ROOT"/vendor/aosip/build/tools/extract_utils.sh
+HELPER="$AICP_ROOT"/vendor/aicp/build/tools/extract_utils.sh
 if [ ! -f "$HELPER" ]; then
     echo "Unable to find helper script at $HELPER"
     exit 1
@@ -52,13 +52,13 @@ if [ -z "$SRC" ]; then
 fi
 
 # Initialize the helper for common device
-setup_vendor "$DEVICE_COMMON" "$VENDOR" "$AOSIP_ROOT" true "$CLEAN_VENDOR"
+setup_vendor "$DEVICE_COMMON" "$VENDOR" "$AICP_ROOT" true "$CLEAN_VENDOR"
 
 extract "$MY_DIR"/proprietary-files.txt "$SRC" "$SECTION"
 
 if [ -s "$MY_DIR"/../$DEVICE/proprietary-files.txt ]; then
     # Reinitialize the helper for device
-    setup_vendor "$DEVICE" "$VENDOR" "$AOSIP_ROOT" false "$CLEAN_VENDOR"
+    setup_vendor "$DEVICE" "$VENDOR" "$AICP_ROOT" false "$CLEAN_VENDOR"
 
     extract "$MY_DIR"/../$DEVICE/proprietary-files.txt "$SRC" "$SECTION"
 fi
diff --git a/kirin970.mk b/kirin970.mk
index dddc818..c3c4687 100644
--- a/kirin970.mk
+++ b/kirin970.mk
@@ -18,8 +18,7 @@ $(call inherit-product, vendor/huawei/kirin970-common/kirin970-common-vendor.mk)
 
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += \
-    $(LOCAL_PATH)/overlay \
-    $(LOCAL_PATH)/overlay-lineage
+    $(LOCAL_PATH)/overlay
 
 # Properties
 -include $(LOCAL_PATH)/system_prop.mk
diff --git a/overlay-lineage/frameworks/base/core/res/res/values/lineage_config.xml b/overlay-lineage/frameworks/base/core/res/res/values/lineage_config.xml
deleted file mode 100644
index b2b9b35..0000000
--- a/overlay-lineage/frameworks/base/core/res/res/values/lineage_config.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<!--
-     Copyright (C) 2017 The LineageOS 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.
--->
-<resources>
-    <!-- Paths to fast charging status file to detect whether an oem fast charger is active -->
-    <string-array name="config_oemFastChargerStatusPaths" translatable="false">
-        <item>/sys/class/power_supply/Battery/fcp_status</item>
-        <item>/sys/class/power_supply/Battery/scp_status</item>
-    </string-array>
-</resources>
diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
deleted file mode 100644
index cb89fbf..0000000
--- a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015-2016 The CyanogenMod Project
-                   2017-2018 The LineageOS 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.
--->
-<resources>
-    <!-- Default value for proximity check on screen wake
-     NOTE ! - Enable for devices that have a fast response proximity sensor (ideally < 300ms)-->
-    <bool name="config_proximityCheckOnWake">true</bool>
-    <integer name="config_proximityCheckTimeout">200</integer>
-    <bool name="config_proximityCheckOnWakeEnabledByDefault">true</bool>
-
-    <!-- Hardware keys present on the device, stored as a bit field.
-         This integer should equal the sum of the corresponding value for each
-         of the following keys present:
-             1 - Home
-             2 - Back
-             4 - Menu
-             8 - Assistant (search)
-            16 - App switch
-            32 - Camera
-            64 - Volume rocker
-         For example, a device with Home, Back and Menu keys would set this
-         config to 7. -->
-    <integer name="config_deviceHardwareKeys">64</integer>
-
-    <!-- Hardware keys present on the device with the ability to wake, stored as a bit field.
-         This integer should equal the sum of the corresponding value for each
-         of the following keys present:
-             1 - Home
-             2 - Back
-             4 - Menu
-             8 - Assistant (search)
-            16 - App switch
-            32 - Camera
-            64 - Volume rocker
-         For example, a device with Home, Back and Menu keys would set this
-         config to 7. -->
-    <integer name="config_deviceHardwareWakeKeys">64</integer>
-
-    <!-- All the capabilities of the LEDs on this device, stored as a bit field.
-         This integer should equal the sum of the corresponding value for each
-         of the following capabilities present:
-
-         // Device has a color adjustable battery light.
-         LIGHTS_RGB_NOTIFICATION_LED = 1
-
-         // Device has a color adjustable notification light.
-         LIGHTS_RGB_BATTERY_LED = 2
-
-         LIGHTS_MULTIPLE_NOTIFICATION_LED = 4 (deprecated)
-
-         // The notification light has adjustable pulsing capability.
-         LIGHTS_PULSATING_LED = 8
-
-         // Device has a multi-segment battery light that is able to
-         // use the light brightness value to determine how many
-         // segments to show (in order to represent battery level).
-         LIGHTS_SEGMENTED_BATTERY_LED = 16
-
-         // The notification light supports HAL adjustable brightness
-         // via the alpha channel.
-         // Note: if a device notification light supports LIGHTS_RGB_NOTIFICATION_LED
-         // then HAL support is not necessary for brightness control.  In this case,
-         // brightness support will be provided by lineage-sdk through the scaling of
-         // RGB color values.
-         LIGHTS_ADJUSTABLE_NOTIFICATION_LED_BRIGHTNESS = 32
-
-         // Device has a battery light.
-         LIGHTS_BATTERY_LED = 64
-
-         // The battery light supports HAL adjustable brightness via
-         // the alpha channel.
-         // Note: if a device battery light supports LIGHTS_RGB_BATTERY_LED then HAL
-         // support is not necessary for brightness control.  In this case,
-         // brightness support will be provided by lineage-sdk through the scaling of
-         // RGB color values.
-         LIGHTS_ADJUSTABLE_BATTERY_LED_BRIGHTNESS = 128
-
-         For example, a device with notification and battery lights that supports
-         pulsating and RGB control would set this config to 75. -->
-    <integer name="config_deviceLightCapabilities">107</integer>
-
-    <!-- The list of vendor package signatures that should also be considered
-         platform signatures, specifically for use on devices with a vendor partition. -->
-    <string-array name="config_vendorPlatformSignatures" translatable="false">
-        <item>30820405308202eda00302010202090083309550b47e0583300d06092a864886f70d0101050500308198310b300906035504061302434e3112301006035504080c094775616e67646f6e673112301006035504070c095368656e677a68656e310f300d060355040a0c0648756177656931183016060355040b0c0f5465726d696e616c436f6d70616e793114301206035504030c0b416e64726f69645465616d3120301e06092a864886f70d01090116116d6f62696c65406875617765692e636f6d301e170d3136303530353037333531345a170d3433303932313037333531345a308198310b300906035504061302434e3112301006035504080c094775616e67646f6e673112301006035504070c095368656e677a68656e310f300d060355040a0c0648756177656931183016060355040b0c0f5465726d696e616c436f6d70616e793114301206035504030c0b416e64726f69645465616d3120301e06092a864886f70d01090116116d6f62696c65406875617765692e636f6d30820122300d06092a864886f70d01010105000382010f003082010a0282010100c9fe1b699203091cb3944030cb1ba7996567182c1ce8be5535d673bc2025f37958e5bb1f4ed870dc229ffc2ed7d16f6cf10c08bc63f53624abe49db543518ef0069686ea5b3f129188652e87eca4b794df591828dd94de14b91ddbf2af156426453b8e739b12625a44b0895bfa1db3cdcce7db52f4d5af7c9918c325475c8273a5e4fe002e0f68082e9ec61d100913618982928ab5767701a8f576113c0810a4850a606233fd654531562bf8a74ac81bf8bacd66ca8a5ca9751f08e9575b402221e48e474f7f2dc91d02cfd87ceeaeb39ccf754cff5f1e8dfe23587955481bf0b8a386993edadc0f725e124f1ecedbef8d3cfbd6ddc783cde4b193f79fae05ed0203010001a350304e301d0603551d0e041604148d42132bfdc2ed970e25f5677cedd26f32527bc8301f0603551d230418301680148d42132bfdc2ed970e25f5677cedd26f32527bc8300c0603551d13040530030101ff300d06092a864886f70d010105050003820101003bc6e2ba8703a211222da8ed350e12cf31ac4d91290c5524da44626c382c8186f8238860b7ebddebba996f204802d72246d1326332ca85aff4a10cdaaa0d886016e26075c9b98799bf4767663d8c1097dccbc609dd3946f6431a35a71ee9ff3731c5b2715c158fe8d64c700b7e3e387e63a62e80ecdd4d007af242abed4b694d5a70d12dbde433fd18e1a7d033142f44cbe9ca187134830b86ecfa78ae2ff6d201014e4cf1d1655f40f4e4f4dd04af3c0416709dd159845d25515ff12f2854180e2ccbc1b05dffce93f9487839c126fa39f1453468a41eb7872b84c736dcb0d90a29775cd863707044f28bce4d05edcce4699605b27ae11e981590f87384726d</item>
-        <item>30820405308202eda003020102020900a0f3d3dcf6866b0b300d06092a864886f70d0101050500308198310b300906035504061302434e3112301006035504080c094775616e67646f6e673112301006035504070c095368656e677a68656e310f300d060355040a0c0648756177656931183016060355040b0c0f5465726d696e616c436f6d70616e793114301206035504030c0b416e64726f69645465616d3120301e06092a864886f70d01090116116d6f62696c65406875617765692e636f6d301e170d3136303530353037333634315a170d3433303932313037333634315a308198310b300906035504061302434e3112301006035504080c094775616e67646f6e673112301006035504070c095368656e677a68656e310f300d060355040a0c0648756177656931183016060355040b0c0f5465726d696e616c436f6d70616e793114301206035504030c0b416e64726f69645465616d3120301e06092a864886f70d01090116116d6f62696c65406875617765692e636f6d30820122300d06092a864886f70d01010105000382010f003082010a0282010100a3a569b7bf84148627c77b8e78c0dcc2e38e5242f2c23a6889c0c4ee3265dbd98a47ed20acabce24ce35b58f35c1255bd2c759228a1cd649cc156c1ea74401bcbf8863ecae4f88f34f43fed2d38e3b5c480d7629770731a81e50cd41dd3b4112346be520624269fefc06ceaf07329db8e731a7c5d344e09c1176f126201d5c13adb0d7df26a332093ff47c542233a8e21001313a28d7179b362606c3c5fd02299da926251aa9d9f136ae99f8f36369e311af25236a43d11e616836490a81141630308a678dcd2d1e5a712c00a60030b9b2e704e774b218565fce8103022fac615c46ff9fa13869de4b34fcbb9df199e63d0df858e2c12b3b13c8d7c8292426550203010001a350304e301d0603551d0e04160414a9c3053753829883509f86d8ceacb2452cc49f84301f0603551d23041830168014a9c3053753829883509f86d8ceacb2452cc49f84300c0603551d13040530030101ff300d06092a864886f70d0101050500038201010091a55307ff067287621b821e09a0e0e4ffd4ad843fe5e43ab7ca94a2b6e769f167037b663267dd6d5566fec26546fd9994ae985e1ab84c186f2ba5090c1fdcb9a31fc14d959a930b0ce6fd5f874f13c97bfa3492fbdbf014212af793342bdf291d1edb304c2173812fa04d01f60423bdd61f6d0f0a6c8522e30fdff183fd2a399e17c5a1b08624ffbcebe3b56ae60ab83008fbaa12af8881f138edde95f716fad35c8bb56e9e0bf8f73a2481646660905de80049908d7179c325f7acd82d094223506ae82e0ca6f1b44d8c43c271f684d721d31350b89a17c719277901ec586a168f702da9d7f0fa2d92c7bbe41a5c1326775f238b73d224d2a8d8c42cfef08a</item>
-        <item>30820405308202eda003020102020900e48675a71f17e5df300d06092a864886f70d0101050500308198310b300906035504061302434e3112301006035504080c094775616e67646f6e673112301006035504070c095368656e677a68656e310f300d060355040a0c0648756177656931183016060355040b0c0f5465726d696e616c436f6d70616e793114301206035504030c0b416e64726f69645465616d3120301e06092a864886f70d01090116116d6f62696c65406875617765692e636f6d301e170d3136303530353037333734335a170d3433303932313037333734335a308198310b300906035504061302434e3112301006035504080c094775616e67646f6e673112301006035504070c095368656e677a68656e310f300d060355040a0c0648756177656931183016060355040b0c0f5465726d696e616c436f6d70616e793114301206035504030c0b416e64726f69645465616d3120301e06092a864886f70d01090116116d6f62696c65406875617765692e636f6d30820122300d06092a864886f70d01010105000382010f003082010a0282010100b028e46ac18d6fa5d8ada155d948262c92d1d362c15b357e4393cd311d7daefef379feab33c9e8b3f8de127ac2f9c37e158afbe64157da6ff9baf00590bfdf6cb0646fa480c723e65dfb5059a95cd8027b9dc27c911540ba10c1539f9dfd5687c237dc8a20dad0ea0783ab642bb787dc35db4493045725a490614bcce2f0596512d7a5f718c81f09197ca71effdc52e54231abc59837e3d654eb5a300e7cf789d8a61fc2d4fea7a73661e0e8f2865c4787dce97f31f7e9c38179e9e8bba9951e2504583f78f536e37e2d3834bc743b6da69e18802961afe2ab55ab544ee3fa31fc8687ac1fb3f3db84d834e4dc56c26f9dbbaaf7452a69749dbb30c1723a8f3d0203010001a350304e301d0603551d0e04160414a4c8e951756a21e75e025124dec59bd45f416498301f0603551d23041830168014a4c8e951756a21e75e025124dec59bd45f416498300c0603551d13040530030101ff300d06092a864886f70d010105050003820101002913b3196b45fd1545c9fa43c3486b35932b0272ef381ad3d3345d750941a9d53375ded9691e7012a7a1fa07bc3d6bb84e03adedb69c236c357fb551c5562339a37e95c2a537982071a1d3f721ce21df926d507943dc73dcec9d555f1d569277152d9aff70b6667cd72e1623c069c8c4a108620bf39904f6667ad7438348e3def7070b6a34113c265333d6c755d469843f085e8c296ed2c179f24dba58b238d6bc1638bcedca3d9f925c7bb1d0128abb4b063874fc3289662dd1e098e0b6edfc27a9939ba216c2a518703bfafbd0e0f82402b55d2a5bbecfa579c1d5f7a6218b0ff14a1c014ced82071000e7ca7be4b0296097ec30b42f898f2e4c62a60982dc</item>
-    </string-array>
-</resources>
diff --git a/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml b/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml
deleted file mode 100644
index 00931f8..0000000
--- a/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2014-2015 The CyanogenMod 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.
--->
-<resources>
-    <!-- Defaults for LineageSettings.Global.DEV_FORCE_SHOW_NAVBAR -->
-    <integer name="def_force_show_navbar">1</integer>
-</resources>
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index 866550c..4d477c9 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -216,4 +216,127 @@
     <!-- Should the pinner service pin the Camera application? -->
     <bool name="config_pinnerCameraApp">true</bool>
 
+    <!-- Default value for proximity check on screen wake
+     NOTE ! - Enable for devices that have a fast response proximity sensor (ideally < 300ms)-->
+    <bool name="config_proximityCheckOnWake">true</bool>
+    <integer name="config_proximityCheckTimeout">200</integer>
+    <bool name="config_proximityCheckOnWakeEnabledByDefault">true</bool>
+
+    <!-- Hardware keys present on the device, stored as a bit field.
+         This integer should equal the sum of the corresponding value for each
+         of the following keys present:
+             1 - Home
+             2 - Back
+             4 - Menu
+             8 - Assistant (search)
+            16 - App switch
+            32 - Camera
+            64 - Volume rocker
+         For example, a device with Home, Back and Menu keys would set this
+         config to 7. -->
+    <integer name="config_deviceHardwareKeys">64</integer>
+
+    <!-- Hardware keys present on the device with the ability to wake, stored as a bit field.
+         This integer should equal the sum of the corresponding value for each
+         of the following keys present:
+             1 - Home
+             2 - Back
+             4 - Menu
+             8 - Assistant (search)
+            16 - App switch
+            32 - Camera
+            64 - Volume rocker
+         For example, a device with Home, Back and Menu keys would set this
+         config to 7. -->
+    <integer name="config_deviceHardwareWakeKeys">64</integer>
+
+    <!-- All the capabilities of the LEDs on this device, stored as a bit field.
+         This integer should equal the sum of the corresponding value for each
+         of the following capabilities present:
+
+         // Device has a color adjustable battery light.
+         LIGHTS_RGB_NOTIFICATION_LED = 1
+
+         // Device has a color adjustable notification light.
+         LIGHTS_RGB_BATTERY_LED = 2
+
+         LIGHTS_MULTIPLE_NOTIFICATION_LED = 4 (deprecated)
+
+         // The notification light has adjustable pulsing capability.
+         LIGHTS_PULSATING_LED = 8
+
+         // Device has a multi-segment battery light that is able to
+         // use the light brightness value to determine how many
+         // segments to show (in order to represent battery level).
+         LIGHTS_SEGMENTED_BATTERY_LED = 16
+
+         // The notification light supports HAL adjustable brightness
+         // via the alpha channel.
+         // Note: if a device notification light supports LIGHTS_RGB_NOTIFICATION_LED
+         // then HAL support is not necessary for brightness control.  In this case,
+         // brightness support will be provided by lineage-sdk through the scaling of
+         // RGB color values.
+         LIGHTS_ADJUSTABLE_NOTIFICATION_LED_BRIGHTNESS = 32
+
+         // Device has a battery light.
+         LIGHTS_BATTERY_LED = 64
+
+         // The battery light supports HAL adjustable brightness via
+         // the alpha channel.
+         // Note: if a device battery light supports LIGHTS_RGB_BATTERY_LED then HAL
+         // support is not necessary for brightness control.  In this case,
+         // brightness support will be provided by lineage-sdk through the scaling of
+         // RGB color values.
+         LIGHTS_ADJUSTABLE_BATTERY_LED_BRIGHTNESS = 128
+
+         For example, a device with notification and battery lights that supports
+         pulsating and RGB control would set this config to 75. -->
+    <integer name="config_deviceLightCapabilities">107</integer>
+
+    <!-- The list of vendor package signatures that should also be considered
+         platform signatures, specifically for use on devices with a vendor partition. -->
+    <string-array name="config_vendorPlatformSignatures" translatable="false">
+        <item>30820405308202eda00302010202090083309550b47e0583300d06092a864886f70d0101050500308198310b300906035504061302434e3112301006035504080c094775616e67646f6e673112301006035504070c095368656e677a68656e310f300d060355040a0c0648756177656931183016060355040b0c0f5465726d696e616c436f6d70616e793114301206035504030c0b416e64726f69645465616d3120301e06092a864886f70d01090116116d6f62696c65406875617765692e636f6d301e170d3136303530353037333531345a170d3433303932313037333531345a308198310b300906035504061302434e3112301006035504080c094775616e67646f6e673112301006035504070c095368656e677a68656e310f300d060355040a0c0648756177656931183016060355040b0c0f5465726d696e616c436f6d70616e793114301206035504030c0b416e64726f69645465616d3120301e06092a864886f70d01090116116d6f62696c65406875617765692e636f6d30820122300d06092a864886f70d01010105000382010f003082010a0282010100c9fe1b699203091cb3944030cb1ba7996567182c1ce8be5535d673bc2025f37958e5bb1f4ed870dc229ffc2ed7d16f6cf10c08bc63f53624abe49db543518ef0069686ea5b3f129188652e87eca4b794df591828dd94de14b91ddbf2af156426453b8e739b12625a44b0895bfa1db3cdcce7db52f4d5af7c9918c325475c8273a5e4fe002e0f68082e9ec61d100913618982928ab5767701a8f576113c0810a4850a606233fd654531562bf8a74ac81bf8bacd66ca8a5ca9751f08e9575b402221e48e474f7f2dc91d02cfd87ceeaeb39ccf754cff5f1e8dfe23587955481bf0b8a386993edadc0f725e124f1ecedbef8d3cfbd6ddc783cde4b193f79fae05ed0203010001a350304e301d0603551d0e041604148d42132bfdc2ed970e25f5677cedd26f32527bc8301f0603551d230418301680148d42132bfdc2ed970e25f5677cedd26f32527bc8300c0603551d13040530030101ff300d06092a864886f70d010105050003820101003bc6e2ba8703a211222da8ed350e12cf31ac4d91290c5524da44626c382c8186f8238860b7ebddebba996f204802d72246d1326332ca85aff4a10cdaaa0d886016e26075c9b98799bf4767663d8c1097dccbc609dd3946f6431a35a71ee9ff3731c5b2715c158fe8d64c700b7e3e387e63a62e80ecdd4d007af242abed4b694d5a70d12dbde433fd18e1a7d033142f44cbe9ca187134830b86ecfa78ae2ff6d201014e4cf1d1655f40f4e4f4dd04af3c0416709dd159845d25515ff12f2854180e2ccbc1b05dffce93f9487839c126fa39f1453468a41eb7872b84c736dcb0d90a29775cd863707044f28bce4d05edcce4699605b27ae11e981590f87384726d</item>
+        <item>30820405308202eda003020102020900a0f3d3dcf6866b0b300d06092a864886f70d0101050500308198310b300906035504061302434e3112301006035504080c094775616e67646f6e673112301006035504070c095368656e677a68656e310f300d060355040a0c0648756177656931183016060355040b0c0f5465726d696e616c436f6d70616e793114301206035504030c0b416e64726f69645465616d3120301e06092a864886f70d01090116116d6f62696c65406875617765692e636f6d301e170d3136303530353037333634315a170d3433303932313037333634315a308198310b300906035504061302434e3112301006035504080c094775616e67646f6e673112301006035504070c095368656e677a68656e310f300d060355040a0c0648756177656931183016060355040b0c0f5465726d696e616c436f6d70616e793114301206035504030c0b416e64726f69645465616d3120301e06092a864886f70d01090116116d6f62696c65406875617765692e636f6d30820122300d06092a864886f70d01010105000382010f003082010a0282010100a3a569b7bf84148627c77b8e78c0dcc2e38e5242f2c23a6889c0c4ee3265dbd98a47ed20acabce24ce35b58f35c1255bd2c759228a1cd649cc156c1ea74401bcbf8863ecae4f88f34f43fed2d38e3b5c480d7629770731a81e50cd41dd3b4112346be520624269fefc06ceaf07329db8e731a7c5d344e09c1176f126201d5c13adb0d7df26a332093ff47c542233a8e21001313a28d7179b362606c3c5fd02299da926251aa9d9f136ae99f8f36369e311af25236a43d11e616836490a81141630308a678dcd2d1e5a712c00a60030b9b2e704e774b218565fce8103022fac615c46ff9fa13869de4b34fcbb9df199e63d0df858e2c12b3b13c8d7c8292426550203010001a350304e301d0603551d0e04160414a9c3053753829883509f86d8ceacb2452cc49f84301f0603551d23041830168014a9c3053753829883509f86d8ceacb2452cc49f84300c0603551d13040530030101ff300d06092a864886f70d0101050500038201010091a55307ff067287621b821e09a0e0e4ffd4ad843fe5e43ab7ca94a2b6e769f167037b663267dd6d5566fec26546fd9994ae985e1ab84c186f2ba5090c1fdcb9a31fc14d959a930b0ce6fd5f874f13c97bfa3492fbdbf014212af793342bdf291d1edb304c2173812fa04d01f60423bdd61f6d0f0a6c8522e30fdff183fd2a399e17c5a1b08624ffbcebe3b56ae60ab83008fbaa12af8881f138edde95f716fad35c8bb56e9e0bf8f73a2481646660905de80049908d7179c325f7acd82d094223506ae82e0ca6f1b44d8c43c271f684d721d31350b89a17c719277901ec586a168f702da9d7f0fa2d92c7bbe41a5c1326775f238b73d224d2a8d8c42cfef08a</item>
+        <item>30820405308202eda003020102020900e48675a71f17e5df300d06092a864886f70d0101050500308198310b300906035504061302434e3112301006035504080c094775616e67646f6e673112301006035504070c095368656e677a68656e310f300d060355040a0c0648756177656931183016060355040b0c0f5465726d696e616c436f6d70616e793114301206035504030c0b416e64726f69645465616d3120301e06092a864886f70d01090116116d6f62696c65406875617765692e636f6d301e170d3136303530353037333734335a170d3433303932313037333734335a308198310b300906035504061302434e3112301006035504080c094775616e67646f6e673112301006035504070c095368656e677a68656e310f300d060355040a0c0648756177656931183016060355040b0c0f5465726d696e616c436f6d70616e793114301206035504030c0b416e64726f69645465616d3120301e06092a864886f70d01090116116d6f62696c65406875617765692e636f6d30820122300d06092a864886f70d01010105000382010f003082010a0282010100b028e46ac18d6fa5d8ada155d948262c92d1d362c15b357e4393cd311d7daefef379feab33c9e8b3f8de127ac2f9c37e158afbe64157da6ff9baf00590bfdf6cb0646fa480c723e65dfb5059a95cd8027b9dc27c911540ba10c1539f9dfd5687c237dc8a20dad0ea0783ab642bb787dc35db4493045725a490614bcce2f0596512d7a5f718c81f09197ca71effdc52e54231abc59837e3d654eb5a300e7cf789d8a61fc2d4fea7a73661e0e8f2865c4787dce97f31f7e9c38179e9e8bba9951e2504583f78f536e37e2d3834bc743b6da69e18802961afe2ab55ab544ee3fa31fc8687ac1fb3f3db84d834e4dc56c26f9dbbaaf7452a69749dbb30c1723a8f3d0203010001a350304e301d0603551d0e04160414a4c8e951756a21e75e025124dec59bd45f416498301f0603551d23041830168014a4c8e951756a21e75e025124dec59bd45f416498300c0603551d13040530030101ff300d06092a864886f70d010105050003820101002913b3196b45fd1545c9fa43c3486b35932b0272ef381ad3d3345d750941a9d53375ded9691e7012a7a1fa07bc3d6bb84e03adedb69c236c357fb551c5562339a37e95c2a537982071a1d3f721ce21df926d507943dc73dcec9d555f1d569277152d9aff70b6667cd72e1623c069c8c4a108620bf39904f6667ad7438348e3def7070b6a34113c265333d6c755d469843f085e8c296ed2c179f24dba58b238d6bc1638bcedca3d9f925c7bb1d0128abb4b063874fc3289662dd1e098e0b6edfc27a9939ba216c2a518703bfafbd0e0f82402b55d2a5bbecfa579c1d5f7a6218b0ff14a1c014ced82071000e7ca7be4b0296097ec30b42f898f2e4c62a60982dc</item>
+    </string-array>
+
+    <!-- Paths to fast charging status file to detect whether an oem fast charger is active -->
+    <string-array name="config_oemFastChargerStatusPaths" translatable="false">
+        <item>/sys/class/power_supply/Battery/fcp_status</item>
+        <item>/sys/class/power_supply/Battery/scp_status</item>
+    </string-array>
+
+    <!-- Whether a software navigation bar should be shown. -->
+    <bool name="config_showNavigationBar">true</bool>
+    
+    <!-- Enable doze alwaysOn Display -->
+    <bool name="config_dozeAlwaysOnDisplayAvailable">true</bool>
+
+    <!-- Whether the display blanks itself when transition from a doze to a non-doze state -->
+    <bool name="config_displayBlanksAfterDoze">true</bool>
+
+    <!-- Set AOD off by default -->
+    <bool name="config_dozeAlwaysOnEnabled">false</bool>
+
+    <!-- Whether device has super charging support -->
+    <bool name="config_hasSuperCharger">true</bool>
+
+    <!-- Control the behavior when the user triple presses the power button.
+            0 - Nothing
+            1 - Toggle theater mode setting
+            2 - Brightness boost
+    -->
+    <integer name="config_triplePressOnPowerBehavior">2</integer>
+
+      <!-- Override the default detection behavior for the framework method
+         android.view.ViewConfiguration#hasPermanentMenuKey().
+         Valid settings are:
+         0 - No change. Use the default autodetection behavior.
+         1 - The device DOES have a permanent menu key; ignore autodetection.
+         2 - The device DOES NOT have a permanent menu key; ignore autodetection. -->
+    <integer name="config_overrideHasPermanentMenuKey">2</integer>
+
+    <!-- Audio panel view placement. Is left side enabled -->
+    <bool name="config_audioPanelOnLeftSide">true</bool>
 </resources>
diff --git a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml b/overlay/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
index da46c31..da46c31 100644
--- a/overlay-lineage/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
+++ b/overlay/packages/apps/Dialer/java/com/android/dialer/callrecord/res/values/config.xml
diff --git a/rootdir/etc/init.kirin970.rc b/rootdir/etc/init.kirin970.rc
index ad63594..dc83b8e 100644
--- a/rootdir/etc/init.kirin970.rc
+++ b/rootdir/etc/init.kirin970.rc
@@ -20,8 +20,8 @@ on fs
 on post-fs-data
     start teecd
 
-on property:ro.lineage.device=*
-    setprop qemu.hw.mainkeys 1
+#on property:ro.aicp.device=*
+#    setprop qemu.hw.mainkeys 1
 
 on property:sys.user.0.ce_available=true
     mkdir /data/sec_storage_data 0700 system system
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 84defd8..f46255d 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -21,9 +21,9 @@ set -e
 MY_DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "$MY_DIR" ]]; then MY_DIR="$PWD"; fi
 
-AOSIP_ROOT="$MY_DIR"/../../..
+AICP_ROOT="$MY_DIR"/../../..
 
-HELPER="$AOSIP_ROOT"/vendor/aosip/build/tools/extract_utils.sh
+HELPER="$AICP_ROOT"/vendor/aicp/build/tools/extract_utils.sh
 if [ ! -f "$HELPER" ]; then
     echo "Unable to find helper script at $HELPER"
     exit 1
@@ -31,7 +31,7 @@ fi
 . "$HELPER"
 
 # Initialize the helper for common
-setup_vendor "$DEVICE_COMMON" "$VENDOR" "$AOSIP_ROOT" true
+setup_vendor "$DEVICE_COMMON" "$VENDOR" "$AICP_ROOT" true
 
 # Copyright headers and guards
 write_headers "berkeley charlotte"
@@ -45,7 +45,7 @@ write_footers
 if [ -s "$MY_DIR"/../$DEVICE/proprietary-files.txt ]; then
     # Reinitialize the helper for device
     INITIAL_COPYRIGHT_YEAR="$DEVICE_BRINGUP_YEAR"
-    setup_vendor "$DEVICE" "$VENDOR" "$AOSIP_ROOT" false
+    setup_vendor "$DEVICE" "$VENDOR" "$AICP_ROOT" false
 
     # Copyright headers and guards
     write_headers