instantnoodlep: Initialize for Evolution X 11.x

* screen.on -> screen.on.display0
* screen.full -> screen.full.display0

AOSP frameworks/base: 8ac63071a4e6da7e0740f5eb6c6753218efcfd3a

Change-Id: Iad50e6cb63368e2d71e6fa1dbb6997c0f95d321e

Android.mk

@@ -1,7 +0,0 @@
-#
-# Copyright (C) 2018 The LineageOS Project
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-
-LOCAL_PATH := $(call my-dir)

configs/display_id_4630947194340276609.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<displayConfiguration>
+    <densityMapping>
+        <density>
+            <height>1080</height>
+            <width>2376</width>
+            <density>450</density>
+        </density>
+        <density>
+            <height>1440</height>
+            <width>3168</width>
+            <density>560</density>
+        </density>
+    </densityMapping>
+</displayConfiguration>

device.mk

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2018 The LineageOS Project
+# Copyright (C) 2018-2025 The LineageOS Project
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -28,9 +28,14 @@ PRODUCT_PACKAGES += \
     fstab.qcom \
     fstab.qcom.ramdisk
 
+# Display
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/display_id_4630947194340276609.xml:$(TARGET_COPY_OUT_VENDOR)/etc/displayconfig/display_id_4630947194340276609.xml
+
 # Overlays
 DEVICE_PACKAGE_OVERLAYS += \
-    $(LOCAL_PATH)/overlay-lineage
+    $(LOCAL_PATH)/overlay-lineage \
+    $(LOCAL_PATH)/overlay-evolution
 
 PRODUCT_PACKAGES += \
     OPlusFrameworksResTarget \
@@ -40,7 +45,7 @@ PRODUCT_PACKAGES += \
 
 # PowerShare
 PRODUCT_PACKAGES += \
-    vendor.lineage.powershare@1.0-service.oplus
+    vendor.lineage.powershare-service.oplus
 
 # Shipping API
 PRODUCT_SHIPPING_API_LEVEL := 29

evolution.dependencies

@@ -0,0 +1,13 @@
+[
+  {
+    "repository"  : "device_oneplus_sm8250-common",
+    "branch"      : "bka",
+    "target_path" : "device/oneplus/sm8250-common"
+  },
+  {
+    "remote"      : "github",
+    "repository"  : "TheMuppets/proprietary_vendor_oneplus_instantnoodlep",
+    "branch"      : "lineage-23.0",
+    "target_path" : "vendor/oneplus/instantnoodlep"
+  }
+]

extract-files.py

@@ -0,0 +1,38 @@
+#!/usr/bin/env -S PYTHONPATH=../../../tools/extract-utils python3
+#
+# SPDX-FileCopyrightText: 2024 The LineageOS Project
+# SPDX-License-Identifier: Apache-2.0
+#
+
+from extract_utils.fixups_blob import (
+    blob_fixup,
+    blob_fixups_user_type,
+)
+from extract_utils.main import (
+    ExtractUtils,
+    ExtractUtilsModule,
+)
+
+namespace_imports = [
+    'vendor/oneplus/sm8250-common',
+]
+
+blob_fixups: blob_fixups_user_type = {
+    'odm/etc/init/wlchgmonitor.rc': blob_fixup()
+        .regex_replace('\tdisabled\n', '')
+        .regex_replace('\tseclabel u:r:wlchgmonitor:s0\n', ''),
+}  # fmt: skip
+
+module = ExtractUtilsModule(
+    'instantnoodlep',
+    'oneplus',
+    namespace_imports=namespace_imports,
+    blob_fixups=blob_fixups,
+    add_firmware_proprietary_file=True,
+)
+
+if __name__ == '__main__':
+    utils = ExtractUtils.device_with_common(
+        module, 'sm8250-common', module.vendor
+    )
+    utils.run()

extract-files.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
-# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-# If we're being sourced by the common script that we called,
-# stop right here. No need to go down the rabbit hole.
-if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
-    return
-fi
-
-set -e
-
-export DEVICE=instantnoodlep
-export DEVICE_COMMON=sm8250-common
-export VENDOR=oneplus
-export VENDOR_COMMON=${VENDOR}
-
-"./../../${VENDOR_COMMON}/${DEVICE_COMMON}/extract-files.sh" "$@"

lineage.dependencies

@@ -1,6 +0,0 @@
-[
-  {
-    "repository": "android_device_oneplus_sm8250-common",
-    "target_path": "device/oneplus/sm8250-common"
-  }
-]

lineage_instantnoodlep.mk

@@ -6,12 +6,13 @@
 
 # Inherit from those products. Most specific first.
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+TARGET_SUPPORTS_OMX_SERVICE := false
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
 
 # Inherit from instantnoodlep device
 $(call inherit-product, device/oneplus/instantnoodlep/device.mk)
 
-# Inherit some common Lineage stuff.
+# Inherit some common Evolution X stuff.
 $(call inherit-product, vendor/lineage/config/common_full_phone.mk)
 
 PRODUCT_NAME := lineage_instantnoodlep
@@ -20,14 +21,12 @@ PRODUCT_MANUFACTURER := OnePlus
 PRODUCT_BRAND := OnePlus
 PRODUCT_MODEL := IN2025
 
-PRODUCT_SYSTEM_NAME := OnePlus8Pro
-PRODUCT_SYSTEM_DEVICE := OnePlus8Pro
-
 PRODUCT_GMS_CLIENTID_BASE := android-oneplus
 
 PRODUCT_BUILD_PROP_OVERRIDES += \
-    PRIVATE_BUILD_DESC="OnePlus8Pro-user 13 RKQ1.211119.001 Q.1870b9f-4227_f18b release-keys" \
-    TARGET_DEVICE=$(PRODUCT_SYSTEM_DEVICE) \
-    TARGET_PRODUCT=$(PRODUCT_SYSTEM_NAME)
-
-BUILD_FINGERPRINT := OnePlus/OnePlus8Pro/OnePlus8Pro:13/RKQ1.211119.001/Q.1870b9f-4227_f18b:user/release-keys
+    BuildDesc="OnePlus8Pro-user 13 RKQ1.211119.001 Q.1870b9f-4227_f18b release-keys" \
+    BuildFingerprint=OnePlus/OnePlus8Pro/OnePlus8Pro:13/RKQ1.211119.001/Q.1870b9f-4227_f18b:user/release-keys \
+    DeviceName=OnePlus8Pro \
+    DeviceProduct=OnePlus8Pro \
+    SystemDevice=OnePlus8Pro \
+    SystemName=OnePlus8Pro

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

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019-2023 The Evolution X Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+<resources>
+
+    <!-- Enforce DisplayModeDirector to select user preferred resolution -->
+    <bool name="config_forceToUseSelectedResolution">true</bool>
+</resources>

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

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2019-2024 The Evolution X Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Android version screen, build maintainer -->
+    <string name="build_maintainer_summary" translatable="false">Manidweep</string>
+    <string name="build_maintainer_donate_url" translatable="false">https://www.paypal.me/manidreddy1</string>
+</resources>

overlay/OPlusFrameworksResTarget/res/xml/power_profile.xml

@@ -15,8 +15,8 @@
        with a power meter. -->
   <item name="none">0</item>
   <item name="ambient on">35</item>
-  <item name="screen.on">97</item>  <!-- ~200mA -->
-  <item name="screen.full">222</item>  <!-- ~300mA -->
+  <item name="screen.on.display0">97</item>  <!-- ~200mA -->
+  <item name="screen.full.display0">222</item>  <!-- ~300mA -->
   <item name="bluetooth.active">46</item> <!-- Bluetooth data transfer, ~10mA -->
   <item name="bluetooth.on">1.7</item>  <!-- Bluetooth on & connectable, but not connected, ~0.1mA -->
   <item name="wifi.on">1.8</item>  <!-- ~3mA -->

overlay/OPlusSystemUIResTarget/res/values/dimens.xml

@@ -8,6 +8,10 @@
     <!--  Allow CornerHandleView and PathSpecCornerPathRenderer to decouple from corner-radius -->
     <dimen name="config_rounded_mask_size">156px</dimen>
 
+    <!-- Microns/ums (1000 um = 1mm) per pixel for the given device. If unspecified, UI that
+         relies on this value will not be sized correctly. -->
+    <item name="pixel_pitch" format="float" type="dimen">49.49</item>
+
     <!-- the padding on the start of the statusbar -->
     <dimen name="status_bar_padding_start">0px</dimen>
 

proprietary-firmware.txt

@@ -19,5 +19,5 @@ qupfw.img;AB
 storsec.img;AB
 tz.img;AB
 uefisecapp.img;AB
-xbl_config_lp5.img:xbl_config.img;AB
-xbl_lp5.img:xbl.img;AB
+xbl_config_lp5.img:xbl_config.img;AB;TRYSRCFIRST
+xbl_lp5.img:xbl.img;AB;TRYSRCFIRST

setup-makefiles.py

@@ -0,0 +1 @@
+#!./extract-files.py --regenerate_makefiles

setup-makefiles.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-#
-# SPDX-FileCopyrightText: 2016 The CyanogenMod Project
-# SPDX-FileCopyrightText: 2017-2024 The LineageOS Project
-# SPDX-License-Identifier: Apache-2.0
-#
-
-# If we're being sourced by the common script that we called,
-# stop right here. No need to go down the rabbit hole.
-if [ "${BASH_SOURCE[0]}" != "${0}" ]; then
-    return
-fi
-
-set -e
-
-export DEVICE=instantnoodlep
-export DEVICE_COMMON=sm8250-common
-export VENDOR=oneplus
-export VENDOR_COMMON=${VENDOR}
-
-"./../../${VENDOR_COMMON}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"

touch/include/TouchscreenGestureConfig.h

@@ -1,35 +1,22 @@
 /*
- * Copyright (C) 2022 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.
+ * SPDX-FileCopyrightText: 2025 The LineageOS Project
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 #pragma once
 
 #include "TouchscreenGesture.h"
 
+namespace aidl {
 namespace vendor {
 namespace lineage {
 namespace touch {
-namespace V1_0 {
-namespace implementation {
 
 const int TouchscreenGesture::kSupportedGestures = makeBitField(
         kGestureUpVee, kGestureLeftVee, kGestureRightVee, kGestureCircle, kGestureDoubleSwipe,
         kGestureUpToDown, kGestureM, kGestureW, kGestureSingleTap, kGestureS);
 
-}  // namespace implementation
-}  // namespace V1_0
 }  // namespace touch
 }  // namespace lineage
 }  // namespace vendor
+}  // namespace aidl