lisa: Adjust override prop key names

Change-Id: I436bbf425023dbe54cf3e2c35f50a5575511bc38

AndroidProducts.mk

@@ -5,4 +5,4 @@
 #
 
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_lisa.mk
+    $(LOCAL_DIR)/aosp_lisa.mk

aosp_lisa.mk

@@ -11,14 +11,12 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 # Inherit from lisa device
 $(call inherit-product, device/xiaomi/lisa/device.mk)
 
-# Inherit some common Evolution-X stuff.
-$(call inherit-product, vendor/lineage/config/common_full_phone.mk)
+# Inherit some common aosp stuff.
+$(call inherit-product, vendor/aosp/config/common_full_phone.mk)
 
 # Bootanimation
 TARGET_BOOT_ANIMATION_RES := 1080
 
-# Evolution-X Stuff
-EVO_BUILD_TYPE := Official
 TARGET_FACE_UNLOCK_SUPPORTED := true
 TARGET_SUPPORTS_QUICK_TAP := true
 
@@ -26,7 +24,7 @@ PRODUCT_BRAND := Xiaomi
 PRODUCT_DEVICE := lisa
 PRODUCT_MANUFACTURER := Xiaomi
 PRODUCT_MODEL := 2109119DG
-PRODUCT_NAME := lineage_lisa
+PRODUCT_NAME := aosp_lisa
 
 PRODUCT_GMS_CLIENTID_BASE := android-xiaomi
 
@@ -34,9 +32,9 @@ PRODUCT_SYSTEM_NAME := lisa_global
 PRODUCT_SYSTEM_DEVICE := lisa
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRIVATE_BUILD_DESC="lisa_global-user 14 UKQ1.231108.001 V816.0.7.0.UKOMIXM release-keys" \
-    TARGET_DEVICE=$(PRODUCT_SYSTEM_DEVICE) \
-    TARGET_PRODUCT=$(PRODUCT_SYSTEM_NAME)
+    BuildDesc="lisa_global-user 14 UKQ1.231108.001 V816.0.7.0.UKOMIXM release-keys" \
+    DeviceName=lisa \
+    DeviceProduct=lisa_global
 
 # Set BUILD_FINGERPRINT variable to be picked up by both system and vendor build.prop
-BUILD_FINGERPRINT := Xiaomi/lisa_global/lisa:14/UKQ1.231108.001/V816.0.7.0.UKOMIXM:user/release-keys
+BuildFingerprint=Xiaomi/lisa_global/lisa:14/UKQ1.231108.001/V816.0.7.0.UKOMIXM:user/release-keys

device.mk

@@ -12,8 +12,7 @@ $(call inherit-product, vendor/xiaomi/miuicamera-lisa/device.mk)
 
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += \
-    $(LOCAL_PATH)/overlay \
-    $(LOCAL_PATH)/overlay-evolution
+    $(LOCAL_PATH)/overlays
 
 # Overlays-RRO
 PRODUCT_PACKAGES += \

overlay-evolution/frameworks/base/core/res/res/values/config.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2019-2021 The Evolution X 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>
-    <!-- Whether the device supports Smart Pixels -->
-    <bool name="config_supportSmartPixels">true</bool>
-</resources>

overlay-evolution/packages/apps/Aperture/app/src/main/res/values/config.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<resources>
-    <!-- Enable auxiliary cameras selector. -->
-    <bool name="config_enableAuxCameras">true</bool>
-
-    <!-- List of ID of auxiliary cameras that must be ignored by the app. -->
-    <string-array name="config_ignoredAuxCameraIds">
-        <item>7</item> <!-- no-op front camera -->
-    </string-array>
-
-    <!-- An array of triplets made of (camera ID, qualities, framerates).
-         These video modes will be added to the available
-         quality/framerate combinations of a camera device.
-         Make sure the device is able to handle those configurations
-         and maintain a stable framerate at any condition.
-         Note that you can't add video qualities that aren't
-         exposed by the camera, only new framerates.
-         Valid values of resolution are:
-          - "sd" (480p)
-          - "hd" (720p)
-          - "fhd" (1080p)
-          - "uhd" (2160p)
-         Valid values of framerate are:
-          - "24"
-          - "30"
-          - "60"
-          - "120"
-         Example:
-             <string-array name="config_additionalVideoConfigurations">
-                 <item>0</item> <item>sd|hd|fhd</item> <item>60|120</item>
-                 <item>1</item> <item>sd|hd|fhd</item> <item>60</item>
-             </string-array>
-    -->
-    <string-array name="config_additionalVideoConfigurations">
-        <item>0</item> <item>sd|hd|fhd</item> <item>60</item>
-        <item>1</item> <item>sd|hd|fhd</item> <item>60</item>
-    </string-array>
-</resources>

overlay-evolution/packages/apps/Settings/res/values/evolution_strings.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2019-2021 The Evolution X 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="build_maintainer_summary">zαι∂ κнαи</string>
-    <string name="build_maintainer_telegram">https://t.me/zaidkhan0997</string>
-</resources>

overlay/frameworks/base/core/res/res/values/config.xml

@@ -321,21 +321,4 @@
 
     <!-- The default peak refresh rate. -->
     <integer name="config_defaultPeakRefreshRate">90</integer>
-
-    <!-- Indicates whether device has a power button fingerprint sensor. -->
-    <bool name="config_is_powerbutton_fps" translatable="false">true</bool>
-
-    <!-- An array of arrays of side fingerprint sensor properties relative to each display.
-         Note: this value is temporary and is expected to be queried directly
-         from the HAL in the future. -->
-    <array name="config_sfps_sensor_props" translatable="false">
-        <item>@array/config_sfps_sensor_props_0</item>
-    </array>
-
-    <array name="config_sfps_sensor_props_0" translatable="false">
-        <item></item>     <!-- displayId -->
-        <item>1080</item> <!-- sensorLocationX -->
-        <item>960</item>  <!-- sensorLocationY -->
-        <item>200</item>  <!-- sensorRadius -->
-    </array>
 </resources>