From ed80ef57dec54f2afb5b73a19cad940462597968 Mon Sep 17 00:00:00 2001 From: Nehemiah Date: Sun, 26 Nov 2023 11:08:53 -0500 Subject: [PATCH] Non GSI --- duoqin/AndroidProducts.mk | 3 - duoqin/board-base.mk | 2 - .../button_backlights.patch | 60 ------------------ qinf21pro/AndroidProducts.mk | 2 + qinf21pro/board-base.mk | 1 + {duoqin => qinf21pro}/duoqin/BoardConfig.mk | 0 .../Vendor_0001_Product_0001_Version_0100.kl | 0 {duoqin => qinf21pro}/files/mtk-kpd.idc | 0 {duoqin => qinf21pro}/files/mtk-kpd.kcm | 0 {duoqin => qinf21pro}/files/mtk-kpd.kl | 0 {duoqin => qinf21pro}/files/mtk-pmic-keys.idc | 0 {duoqin => qinf21pro}/files/mtk-pmic-keys.kcm | 0 {duoqin => qinf21pro}/files/mtk-pmic-keys.kl | 0 .../res/drawable-nodpi/default_wallpaper.png | Bin .../base/core/res/res/values/config.xml | 0 .../res/res/xml/config_webview_packages.xml | 0 .../patches}/button_backlights.patch | 0 {duoqin => qinf21pro}/patches/launcher3.patch | 0 .../qinf21pro.mk | 28 +------- {duoqin => qinf21pro}/system.prop | 0 20 files changed, 6 insertions(+), 90 deletions(-) delete mode 100644 duoqin/AndroidProducts.mk delete mode 100644 duoqin/board-base.mk delete mode 100644 duoqin/patches/F22Pro/platform_frameworks_base/button_backlights.patch create mode 100644 qinf21pro/AndroidProducts.mk create mode 100644 qinf21pro/board-base.mk rename {duoqin => qinf21pro}/duoqin/BoardConfig.mk (100%) rename {duoqin => qinf21pro}/files/Vendor_0001_Product_0001_Version_0100.kl (100%) rename {duoqin => qinf21pro}/files/mtk-kpd.idc (100%) rename {duoqin => qinf21pro}/files/mtk-kpd.kcm (100%) rename {duoqin => qinf21pro}/files/mtk-kpd.kl (100%) rename {duoqin => qinf21pro}/files/mtk-pmic-keys.idc (100%) rename {duoqin => qinf21pro}/files/mtk-pmic-keys.kcm (100%) rename {duoqin => qinf21pro}/files/mtk-pmic-keys.kl (100%) rename {duoqin => qinf21pro}/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png (100%) rename {duoqin => qinf21pro}/overlay/frameworks/base/core/res/res/values/config.xml (100%) rename {duoqin => qinf21pro}/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml (100%) rename {duoqin/patches/F21Pro/platform_frameworks_base => qinf21pro/patches}/button_backlights.patch (100%) rename {duoqin => qinf21pro}/patches/launcher3.patch (100%) rename duoqin/duoqin_f21pro.mk => qinf21pro/qinf21pro.mk (63%) rename {duoqin => qinf21pro}/system.prop (100%) diff --git a/duoqin/AndroidProducts.mk b/duoqin/AndroidProducts.mk deleted file mode 100644 index 548bf84..0000000 --- a/duoqin/AndroidProducts.mk +++ /dev/null @@ -1,3 +0,0 @@ -PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/duoqin_f21pro.mk \ - $(LOCAL_DIR)/duoqin_f22pro.mk diff --git a/duoqin/board-base.mk b/duoqin/board-base.mk deleted file mode 100644 index 84528e2..0000000 --- a/duoqin/board-base.mk +++ /dev/null @@ -1,2 +0,0 @@ -BOARD_PLAT_PRIVATE_SEPOLICY_DIR += device/wephone/duoqin/sepolicy -TARGET_SYSTEM_PROP := device/wephone/duoqin/system.prop $(TARGET_SYSTEM_PROP) \ No newline at end of file diff --git a/duoqin/patches/F22Pro/platform_frameworks_base/button_backlights.patch b/duoqin/patches/F22Pro/platform_frameworks_base/button_backlights.patch deleted file mode 100644 index 46b6309..0000000 --- a/duoqin/patches/F22Pro/platform_frameworks_base/button_backlights.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java -index 1224902aa7be..68855ebf06b9 100644 ---- a/services/core/java/com/android/server/display/DisplayPowerController.java -+++ b/services/core/java/com/android/server/display/DisplayPowerController.java -@@ -70,6 +70,10 @@ import com.android.server.display.whitebalance.DisplayWhiteBalanceFactory; - import com.android.server.display.whitebalance.DisplayWhiteBalanceSettings; - import com.android.server.policy.WindowManagerPolicy; - -+// Button backlights -+import com.android.server.lights.LightsManager; -+import com.android.server.lights.LogicalLight; -+ - import java.io.PrintWriter; - - /** -@@ -276,6 +280,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call - // Must only be accessed on the handler thread. - private DisplayPowerState mPowerState; - -+ // Buttons backlight -+ private LightsManager mLightsManager; -+ private LogicalLight mButtonsLight; -+ - // True if the device should wait for negative proximity sensor before - // waking up the screen. This is set to false as soon as a negative - // proximity sensor measurement is observed or when the device is forced to -@@ -817,6 +825,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call - mPowerState = new DisplayPowerState(mBlanker, - mColorFadeEnabled ? new ColorFade(mDisplayId) : null, mDisplayId, displayState); - -+ mLightsManager = LocalServices.getService(LightsManager.class); -+ mButtonsLight = mLightsManager.getLight(LightsManager.LIGHT_ID_BUTTONS); -+ - if (mColorFadeEnabled) { - mColorFadeOnAnimator = ObjectAnimator.ofFloat( - mPowerState, DisplayPowerState.COLOR_FADE_LEVEL, 0.0f, 1.0f); -@@ -1452,6 +1463,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call - && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_TURNING_ON) { - setReportedScreenState(REPORTED_TO_POLICY_SCREEN_ON); - mWindowManagerPolicy.screenTurnedOn(mDisplayId); -+ mButtonsLight.setBrightness(PowerManager.BRIGHTNESS_MAX); - } - - // Grab a wake lock if we have unfinished business. -@@ -1652,6 +1664,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call - setReportedScreenState(REPORTED_TO_POLICY_SCREEN_OFF); - unblockScreenOn(); - mWindowManagerPolicy.screenTurnedOff(mDisplayId); -+ mButtonsLight.setBrightness(PowerManager.BRIGHTNESS_OFF_FLOAT); - } else if (!isOff - && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_TURNING_OFF) { - -@@ -1659,6 +1672,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call - // Complete the full state transition on -> turningOff -> off. - unblockScreenOff(); - mWindowManagerPolicy.screenTurnedOff(mDisplayId); -+ mButtonsLight.setBrightness(PowerManager.BRIGHTNESS_OFF_FLOAT); - setReportedScreenState(REPORTED_TO_POLICY_SCREEN_OFF); - } - if (!isOff diff --git a/qinf21pro/AndroidProducts.mk b/qinf21pro/AndroidProducts.mk new file mode 100644 index 0000000..2cb14f7 --- /dev/null +++ b/qinf21pro/AndroidProducts.mk @@ -0,0 +1,2 @@ +PRODUCT_MAKEFILES := \ + $(LOCAL_DIR)/qinf21pro.mk diff --git a/qinf21pro/board-base.mk b/qinf21pro/board-base.mk new file mode 100644 index 0000000..3056662 --- /dev/null +++ b/qinf21pro/board-base.mk @@ -0,0 +1 @@ +TARGET_SYSTEM_PROP := device/wephone/duoqin/system.prop $(TARGET_SYSTEM_PROP) \ No newline at end of file diff --git a/duoqin/duoqin/BoardConfig.mk b/qinf21pro/duoqin/BoardConfig.mk similarity index 100% rename from duoqin/duoqin/BoardConfig.mk rename to qinf21pro/duoqin/BoardConfig.mk diff --git a/duoqin/files/Vendor_0001_Product_0001_Version_0100.kl b/qinf21pro/files/Vendor_0001_Product_0001_Version_0100.kl similarity index 100% rename from duoqin/files/Vendor_0001_Product_0001_Version_0100.kl rename to qinf21pro/files/Vendor_0001_Product_0001_Version_0100.kl diff --git a/duoqin/files/mtk-kpd.idc b/qinf21pro/files/mtk-kpd.idc similarity index 100% rename from duoqin/files/mtk-kpd.idc rename to qinf21pro/files/mtk-kpd.idc diff --git a/duoqin/files/mtk-kpd.kcm b/qinf21pro/files/mtk-kpd.kcm similarity index 100% rename from duoqin/files/mtk-kpd.kcm rename to qinf21pro/files/mtk-kpd.kcm diff --git a/duoqin/files/mtk-kpd.kl b/qinf21pro/files/mtk-kpd.kl similarity index 100% rename from duoqin/files/mtk-kpd.kl rename to qinf21pro/files/mtk-kpd.kl diff --git a/duoqin/files/mtk-pmic-keys.idc b/qinf21pro/files/mtk-pmic-keys.idc similarity index 100% rename from duoqin/files/mtk-pmic-keys.idc rename to qinf21pro/files/mtk-pmic-keys.idc diff --git a/duoqin/files/mtk-pmic-keys.kcm b/qinf21pro/files/mtk-pmic-keys.kcm similarity index 100% rename from duoqin/files/mtk-pmic-keys.kcm rename to qinf21pro/files/mtk-pmic-keys.kcm diff --git a/duoqin/files/mtk-pmic-keys.kl b/qinf21pro/files/mtk-pmic-keys.kl similarity index 100% rename from duoqin/files/mtk-pmic-keys.kl rename to qinf21pro/files/mtk-pmic-keys.kl diff --git a/duoqin/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png b/qinf21pro/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png similarity index 100% rename from duoqin/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png rename to qinf21pro/overlay/frameworks/base/core/res/res/drawable-nodpi/default_wallpaper.png diff --git a/duoqin/overlay/frameworks/base/core/res/res/values/config.xml b/qinf21pro/overlay/frameworks/base/core/res/res/values/config.xml similarity index 100% rename from duoqin/overlay/frameworks/base/core/res/res/values/config.xml rename to qinf21pro/overlay/frameworks/base/core/res/res/values/config.xml diff --git a/duoqin/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml b/qinf21pro/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml similarity index 100% rename from duoqin/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml rename to qinf21pro/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml diff --git a/duoqin/patches/F21Pro/platform_frameworks_base/button_backlights.patch b/qinf21pro/patches/button_backlights.patch similarity index 100% rename from duoqin/patches/F21Pro/platform_frameworks_base/button_backlights.patch rename to qinf21pro/patches/button_backlights.patch diff --git a/duoqin/patches/launcher3.patch b/qinf21pro/patches/launcher3.patch similarity index 100% rename from duoqin/patches/launcher3.patch rename to qinf21pro/patches/launcher3.patch diff --git a/duoqin/duoqin_f21pro.mk b/qinf21pro/qinf21pro.mk similarity index 63% rename from duoqin/duoqin_f21pro.mk rename to qinf21pro/qinf21pro.mk index e52e410..38498e9 100644 --- a/duoqin/duoqin_f21pro.mk +++ b/qinf21pro/qinf21pro.mk @@ -1,30 +1,8 @@ -# -# All components inherited here go to system image -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk) +TARGET_GAPPS_ARCH := arm64 -# Enable mainline checking -# PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed +include build/make/target/product/aosp_arm64_ab.mk -# -# All components inherited here go to system_ext image -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk) - -# -# All components inherited here go to product image -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) - -# -# Special settings for GSI releasing -# -$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk) - - -PRODUCT_NAME := duoqin_f21pro +PRODUCT_NAME := qinf21pro PRODUCT_DEVICE := duoqin PRODUCT_BRAND := wephone PRODUCT_MODEL := weOs | v11.0.1 | Nehemiah diff --git a/duoqin/system.prop b/qinf21pro/system.prop similarity index 100% rename from duoqin/system.prop rename to qinf21pro/system.prop