Let's use the default webview for this build

cat/AndroidProducts.mk

@@ -1,2 +0,0 @@
-PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/cat_s22.mk

cat/cat_s22/BoardConfig.mk

@@ -1,9 +0,0 @@
-include build/make/target/board/generic_arm_ab/BoardConfig.mk
-#include device/phh/treble/board-base.mk
-
-ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1572864000
-endif
-
-TARGET_USES_64_BIT_BINDER := true
-TARGET_SYSTEM_PROP := device/wephone/cat/system.prop $(TARGET_SYSTEM_PROP)

cats22flip/AndroidProducts.mk

@@ -0,0 +1,2 @@
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/cats22flip.mk

cats22flip/board-base.mk

@@ -0,0 +1 @@
+TARGET_SYSTEM_PROP := device/wephone/cats22flip/system.prop $(TARGET_SYSTEM_PROP)

cats22flip/cat/BoardConfig.mk

@@ -0,0 +1,8 @@
+include build/make/target/board/generic/BoardConfig.mk
+include device/wephone/cats22flip/board-base.mk
+
+ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1572864000
+endif
+
+TARGET_USES_64_BIT_BINDER := true

cats22flip/cats22flip.mk

@@ -0,0 +1,42 @@
+TARGET_GAPPS_ARCH := arm
+
+include build/make/target/product/aosp_arm.mk
+include build/make/target/product/gsi_release.mk
+
+PRODUCT_NAME := cats22flip
+PRODUCT_DEVICE := cat
+PRODUCT_BRAND := wephone
+PRODUCT_MODEL := weOs | v14.0.1 | Nehemiah
+
+# This is for a device
+PRODUCT_CHARACTERISTICS := device
+
+PRODUCT_PACKAGE_OVERLAYS += device/wephone/cats22flip/overlay
+
+PRODUCT_COPY_FILES += \
+    device/wephone/cats22flip/files/qpnp_pon.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/qpnp_pon.kl \
+    device/wephone/cats22flip/files/soc_matrix_keypad.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/soc_matrix_keypad.kl \
+    device/wephone/cats22flip/files/soc_matrix_keypad.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/soc_matrix_keypad.kcm
+
+PRODUCT_PACKAGES += \
+    BromiteSystemWebView \
+    Conversations \
+    Davx5 \
+    DeskClock \
+    Etar \
+    ExactCalculator \
+    Gallery2 \
+    K-9Mail \
+    Linphone \
+    Nextcloud \
+    NextcloudNotes \
+    OpenDocumentReader \
+    Wireguard
+
+PRODUCT_PACKAGES -= \
+    EasterEgg \
+    webview \
+    libwebviewchromium_loader \
+    libwebviewchromium_plat_support \
+    CtsShimPrebuilt \
+    CtsShimPrivPrebuilt

cats22flip/files/qpnp_pon.kl

@@ -0,0 +1,2 @@
+key 114   VOLUME_DOWN   WAKE
+key 116   POWER

cats22flip/files/soc_matrix_keypad.kcm

@@ -0,0 +1,17 @@
+type FULL
+
+key BUTTON_1 {
+    base:                               fallback DPAD_UP
+}
+
+key BUTTON_2 {
+    base:                               fallback DPAD_LEFT
+}
+
+key BUTTON_3 {
+    base:                               fallback DPAD_RIGHT
+}
+
+key BUTTON_4 {
+    base:                               fallback DPAD_DOWN
+}

cats22flip/files/soc_matrix_keypad.kl

@@ -0,0 +1,52 @@
+key 2     1
+key 3     2
+key 4     3
+key 5     4
+key 6     5
+key 7     6
+key 8     7
+key 9     8
+key 10    9
+key 11    0
+
+# CLEAR
+key 14    DEL
+
+# DPAD CENTER
+key 28    ENTER
+
+# DPAD UP
+key 103   BUTTON_1
+
+# DPAD LEFT
+key 105   BUTTON_2
+
+# DPAD RIGHT
+key 106   BUTTON_3
+
+# DPAD DOWN
+key 108   BUTTON_4
+
+# BACK
+key 158   BACK
+
+# CALL
+key 169   CALL
+
+# HOME
+key 172   HOME
+
+# FUNCTION
+key 248   SYM
+
+# APP SWITCH
+key 580   APP_SWITCH
+
+# STAR
+key 522   STAR
+
+# POUND
+key 523   POUND
+
+# SIDE BUTTON
+key 525   CTRL_LEFT

cats22flip/patches/button_backlights.patch

@@ -0,0 +1,60 @@
+diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
+index 7c0f4197363..16758ba496e 100644
+--- a/services/core/java/com/android/server/display/DisplayPowerController.java
++++ b/services/core/java/com/android/server/display/DisplayPowerController.java
+@@ -63,7 +63,12 @@ import com.android.server.display.whitebalance.DisplayWhiteBalanceFactory;
+ import com.android.server.display.whitebalance.DisplayWhiteBalanceSettings;
+ import com.android.server.policy.WindowManagerPolicy;
+ 
++import java.io.BufferedWriter;
++import java.io.File;
++import java.io.FileWriter;
++import java.io.IOException;
+ import java.io.PrintWriter;
++import java.io.Writer;
+ import java.util.List;
+ 
+ /**
+@@ -561,6 +566,18 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+         mDisplayWhiteBalanceController = displayWhiteBalanceController;
+     }
+ 
++    private void changeKeyboardBacklightState(String value) {
++        try {
++          File outputFile = new File("/sys/class/leds/keyboard_light/", "brightness");
++          Writer writer = new BufferedWriter(new FileWriter(outputFile));
++
++          writer.write(value);
++          writer.close();
++        } catch (IOException e) {
++          Slog.d("NEHEMIAH", "Sorry, failed to change the value of the keyboard backlight");
++        }
++    }
++
+     private Sensor findDisplayLightSensor(String sensorType) {
+         if (!TextUtils.isEmpty(sensorType)) {
+             List<Sensor> sensors = mSensorManager.getSensorList(Sensor.TYPE_ALL);
+@@ -1154,6 +1171,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+                 && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_TURNING_ON) {
+             setReportedScreenState(REPORTED_TO_POLICY_SCREEN_ON);
+             mWindowManagerPolicy.screenTurnedOn();
++            changeKeyboardBacklightState("255");
+         }
+ 
+         // Grab a wake lock if we have unfinished business.
+@@ -1310,6 +1328,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+             setReportedScreenState(REPORTED_TO_POLICY_SCREEN_OFF);
+             unblockScreenOn();
+             mWindowManagerPolicy.screenTurnedOff();
++            changeKeyboardBacklightState("0");
+         } else if (!isOff
+                 && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_TURNING_OFF) {
+ 
+@@ -1317,6 +1336,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+             // Complete the full state transition on -> turningOff -> off.
+             unblockScreenOff();
+             mWindowManagerPolicy.screenTurnedOff();
++            changeKeyboardBacklightState("0");
+             setReportedScreenState(REPORTED_TO_POLICY_SCREEN_OFF);
+         }
+         if (!isOff && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_OFF) {

cm17/AndroidProducts.mk

@@ -0,0 +1,2 @@
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/cm17.mk

cm17/cm17.mk

@@ -0,0 +1,56 @@
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.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
+#
+# ifeq (aosp_arm64,$(TARGET_PRODUCT))
+$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
+# endif
+
+PRODUCT_CHARACTERISTICS := device
+
+PRODUCT_NAME := cm17
+PRODUCT_DEVICE := cm17
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := AOSP on ARM64
+PRODUCT_AAPT_CONFIG := normal
+PRODUCT_AAPT_PREF_CONFIG := xhdpi
+
+PRODUCT_PACKAGE_OVERLAYS += device/wephone/cm17/overlay
+
+# Use a more decent APN config
+PRODUCT_COPY_FILES += \
+	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
+
+ifneq (,$(wildcard external/exfat))
+PRODUCT_PACKAGES += \
+	mkfs.exfat \
+	fsck.exfat
+endif
+
+PRODUCT_PACKAGES += \
+	TrichromeWebView \
+	Contacts \
+	DeskClock \
+	Etar \
+	ExactCalculator \
+	Gallery2
+
+
+PRODUCT_PACKAGES -= \
+	EasterEgg \
+	webview \
+	libwebviewchromium_loader \
+	libwebviewchromium_plat_support

cm17/cm17/BoardConfig.mk

@@ -0,0 +1,31 @@
+TARGET_ARCH := arm64
+TARGET_ARCH_VARIANT := armv8-a
+TARGET_CPU_ABI := arm64-v8a
+TARGET_CPU_ABI2 :=
+TARGET_CPU_VARIANT := generic
+
+TARGET_2ND_ARCH := arm
+TARGET_2ND_ARCH_VARIANT := armv8-a
+TARGET_2ND_CPU_ABI := armeabi-v7a
+TARGET_2ND_CPU_ABI2 := armeabi
+TARGET_2ND_CPU_VARIANT := generic
+
+include build/make/target/board/BoardConfigGsiCommon.mk
+
+# TODO(jiyong) These might be SoC specific.
+BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
+
+# TODO(b/36764215): remove this setting when the generic system image
+# no longer has QCOM-specific directories under /.
+BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy
+
+TARGET_EXFAT_DRIVER := exfat
+TARGET_SYSTEM_PROP := device/wephone/ttp/system.prop $(TARGET_SYSTEM_PROP)
+
+ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
+else
+BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432
+endif
+
+TARGET_USES_64_BIT_BINDER := true

cm17/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 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.
+-->
+
+<webviewproviders>
+    <!-- The default WebView implementation -->
+    <webviewprovider description="Vanadium" packageName="app.vanadium.webview" availableByDefault="true">
+    </webviewprovider>
+</webviewproviders>

cm17/system.prop

@@ -3,3 +3,9 @@ persist.bluetooth.bluetooth_audio_hal.disabled=true
 persist.sys.bt.unsupport.features=00000000
 persist.sys.bt.unsupport.states=00000000
 persist.sys.bt.unsupport.stdfeatures=000001
+qemu.hw.mainkeys=1
+hw.lcd.width = 716
+hw.lcd.height = 720
+hw.lcd.depth = 24
+hw.lcd.density = 220
+ro.sf.lcd_density=220

duoqin/AndroidProducts.mk

@@ -1,3 +0,0 @@
-PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/duoqin_f21pro.mk \
-    $(LOCAL_DIR)/duoqin_f22pro.mk

duoqin/board-base.mk

@@ -1 +0,0 @@
-TARGET_SYSTEM_PROP := device/wephone/duoqin/system.prop $(TARGET_SYSTEM_PROP)

duoqin/duoqin_f21pro.mk

@@ -1,64 +0,0 @@
-#
-# 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)
-
-# Enable mainline checking
-# PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
-
-#
-# 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_DEVICE := duoqin
-PRODUCT_BRAND := generic
-PRODUCT_MODEL := Duoqin F21pro - wePhone
-
-# This is for a device
-PRODUCT_CHARACTERISTICS := device
-
-PRODUCT_PACKAGE_OVERLAYS += device/wephone/duoqin/overlay
-
-PRODUCT_COPY_FILES += \
-	device/wephone/duoqin/files/mtk-kpd.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-kpd.idc \
-	device/wephone/duoqin/files/mtk-kpd.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/mtk-kpd.kcm \
-	device/wephone/duoqin/files/mtk-kpd.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-kpd.kl \
-	device/wephone/duoqin/files/mtk-pmic-keys.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-pmic-keys.idc \
-	device/wephone/duoqin/files/mtk-pmic-keys.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/mtk-pmic-keys.kcm \
-	device/wephone/duoqin/files/mtk-pmic-keys.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-pmic-keys.kl \
-	device/wephone/duoqin/files/Vendor_0001_Product_0001_Version_0100.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/Vendor_0001_Product_0001_Version_0100.kl
-
-PRODUCT_PACKAGES += \
-	BromiteSystemWebView \
-	Conversations \
-	Davx5 \
-	DeskClock \
-	Etar \
-	FDroid \
-	Gallery2 \
-	Linphone \
-	Nextcloud \
-	NextcloudNotes \
-	OpenCalc \
-	Wireguard
-
-PRODUCT_PACKAGES -= \
-	EasterEgg \
-	webview \
-	libwebviewchromium_loader \
-    libwebviewchromium_plat_support

duoqin/duoqin_f22pro.mk

@@ -1,71 +0,0 @@
-# $(call inherit-product, vendor/hardware_overlay/overlay.mk)
-
-#
-# 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/generic_system.mk)
-
-# Enable mainline checking
-# PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := true
-
-#
-# All components inherited here go to system_ext image
-#
-$(call inherit-product, device/nehemiah/wephone/gsi_system_ext.mk)
-
-#
-# All components inherited here go to product image
-#
-$(call inherit-product, device/generic/common/gsi_product.mk)
-
-#
-# All components inherited here go to boot image
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk)
-
-#
-# Special settings for GSI releasing
-#
-$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
-
-PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
-
-PRODUCT_NAME := duoqin-f22pro
-PRODUCT_DEVICE := duoqin
-PRODUCT_BRAND := wePhone
-PRODUCT_MODEL := F22pro wePhone
-
-PRODUCT_CHARACTERISTICS := device
-
-PRODUCT_PACKAGE_OVERLAYS += device/nehemiah/wephone/overlay
-
-PRODUCT_COPY_FILES += \
-	device/nehemiah/wephone/files/mtk-kpd.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-kpd.idc \
-	device/nehemiah/wephone/files/mtk-kpd.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/mtk-kpd.kcm \
-	device/nehemiah/wephone/files/mtk-kpd.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-kpd.kl
-
-PRODUCT_COPY_FILES += \
-	device/nehemiah/wephone/files/f22pro-animation.zip:$(TARGET_COPY_OUT_SYSTEM)/media/bootanimation.zip \
-    device/nehemiah/wephone/files/privapp-permissions-app.lawnchair.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-app.lawnchair.xml \
-    device/nehemiah/wephone/files/privapp-permissions-net.mezimmah.wkt9.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/privapp-permissions-net.mezimmah.wkt9.xml
-
-PRODUCT_PACKAGES += \
-	mkfs.exfat \
-	fsck.exfat
-
-PRODUCT_PACKAGES += \
-	BromiteSystemWebView \
-	Contacts \
-	Conversations \
-	Davx5 \
-	Etar \
-	ExactCalculator \
-	DeskClock \
-	FDroid \
-	Gallery2 \
-	Lawnchair \
-	Lawnicons \
-	Linphone \
-	Nextcloud \
-	Wireguard

duoqin/files/privapp-permissions-app.lawnchair.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <privapp-permissions package="app.lawnchair">
-        <permission name="android.permission.INTERNET"/>
-        <permission name="android.permission.PACKAGE_USAGE_STATS"/>
-        <permission name="android.permission.FOREGROUND_SERVICE"/>
-        <permission name="com.google.android.apps.nexuslauncher.permission.QSB"/>
-        <permission name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS"/>
-        <permission name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS"/>
-        <permission name="android.permission.VIBRATE"/>
-        <permission name="android.permission.QUERY_ALL_PACKAGES"/>
-        <permission name="android.permission.START_TASKS_FROM_RECENTS"/>
-        <permission name="android.permission.REMOVE_TASKS"/>
-        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
-        <permission name="android.permission.MANAGE_ACTIVITY_TASKS"/>
-        <permission name="android.permission.STATUS_BAR"/>
-        <permission name="android.permission.STOP_APP_SWITCHES"/>
-        <permission name="android.permission.SET_ORIENTATION"/>
-        <permission name="android.permission.READ_FRAME_BUFFER"/>
-        <permission name="android.permission.MANAGE_ACCESSIBILITY"/>
-        <permission name="android.permission.MONITOR_INPUT"/>
-        <permission name="android.permission.ALLOW_SLIPPERY_TOUCHES"/>
-        <permission name="android.permission.SYSTEM_APPLICATION_OVERLAY"/>
-        <permission name="android.permission.CALL_PHONE"/>
-        <permission name="android.permission.SET_WALLPAPER"/>
-        <permission name="android.permission.SET_WALLPAPER_HINTS"/>
-        <permission name="android.permission.BIND_APPWIDGET"/>
-        <permission name="android.permission.READ_EXTERNAL_STORAGE"/>
-        <permission name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-        <permission name="android.permission.REQUEST_DELETE_PACKAGES"/>
-        <permission name="android.permission.READ_DEVICE_CONFIG"/>
-        <permission name="android.permission.EXPAND_STATUS_BAR"/>
-        <permission name="android.permission.ROTATE_SURFACE_FLINGER"/>
-        <permission name="app.lawnchair.permission.READ_SETTINGS"/>
-        <permission name="app.lawnchair.permission.WRITE_SETTINGS"/>
-        <permission name="app.lawnchair.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION"/>
-    </privapp-permissions>
-</permissions>

duoqin/files/privapp-permissions-net.mezimmah.wkt9.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<permissions>
-    <privapp-permissions package="net.mezimmah.wkt9">
-    	<permission name="android.permission.INTERNET"/>
-    	<permission name="android.permission.RECORD_AUDIO"/>
-    	<permission name="android.permission.POST_NOTIFICATIONS"/>
-	    <permission name="android.permission.CONTROL_DEVICE_LIGHTS"/>
-    </privapp-permissions>
-</permissions>

duoqin/gsi_system_ext.mk

@@ -1,35 +0,0 @@
-#
-# Copyright (C) 2021 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.
-#
-
-# This makefile contains the system_ext partition contents for CTS on
-# GSI compliance testing. Only add something here for this purpose.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/media_system_ext.mk)
-
-#  handheld packages
-PRODUCT_PACKAGES += \
-    Launcher3QuickStep \
-    Provision \
-    Settings \
-    StorageManager \
-    SystemUI
-
-#  telephony packages
-PRODUCT_PACKAGES += \
-    CarrierConfig
-
-# Install a copy of the debug policy in GSI.
-#PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT := true
-#PRODUCT_PACKAGES += system_ext_userdebug_plat_sepolicy.cil

jelly_star/AndroidProducts.mk

@@ -0,0 +1,2 @@
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/jelly_star.mk

jelly_star/jelly_star.mk

@@ -7,10 +7,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk)
 
-
-# Enable mainline checking
-# PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed
-
 #
 # All components inherited here go to product image
 #
@@ -19,31 +15,33 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk)
 #
 # Special settings for GSI releasing
 #
+# ifeq (aosp_arm64,$(TARGET_PRODUCT))
 $(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
-
+# endif
-# Don't build super.img.
-PRODUCT_BUILD_SUPER_PARTITION := false
-
-PRODUCT_NAME := cat_s22
-PRODUCT_DEVICE := cat_s22
-PRODUCT_BRAND := Android
-PRODUCT_MODEL := wePhone Cat S22
 
 PRODUCT_CHARACTERISTICS := device
 
-PRODUCT_PACKAGE_OVERLAYS += device/wephone/cat/overlay
+PRODUCT_NAME := jelly_star
+PRODUCT_DEVICE := jelly_star
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := AOSP on Unihertz Jelly Star
+PRODUCT_AAPT_CONFIG := normal
+PRODUCT_AAPT_PREF_CONFIG := xhdpi
+
+PRODUCT_PACKAGE_OVERLAYS += device/wephone/ttp/overlay
+
+# Use a more decent APN config
+PRODUCT_COPY_FILES += \
+	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
+
+ifneq (,$(wildcard external/exfat))
+PRODUCT_PACKAGES += \
+	mkfs.exfat \
+	fsck.exfat
+endif
 
 PRODUCT_PACKAGES += \
-    BromiteSystemWebView \
+	TrichromeWebView 
-    Conversations \
-    Davx5 \
-    Etar \
-    ExactCalculator \
-    DeskClock \
-    FDroid \
-    Linphone \
-    Nextcloud \
-    Wireguard
 
 PRODUCT_PACKAGES -= \
 	EasterEgg \

jelly_star/jelly_star/BoardConfig.mk

@@ -0,0 +1,29 @@
+TARGET_ARCH := arm64
+TARGET_ARCH_VARIANT := armv8-a
+TARGET_CPU_ABI := arm64-v8a
+TARGET_CPU_ABI2 :=
+TARGET_CPU_VARIANT := generic
+
+TARGET_2ND_ARCH := arm
+TARGET_2ND_ARCH_VARIANT := armv8-a
+TARGET_2ND_CPU_ABI := armeabi-v7a
+TARGET_2ND_CPU_ABI2 := armeabi
+TARGET_2ND_CPU_VARIANT := generic
+
+include build/make/target/board/BoardConfigGsiCommon.mk
+
+# TODO(jiyong) These might be SoC specific.
+BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
+
+# TODO(b/36764215): remove this setting when the generic system image
+# no longer has QCOM-specific directories under /.
+BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy
+
+TARGET_EXFAT_DRIVER := exfat
+TARGET_SYSTEM_PROP := device/wephone/ttp/system.prop $(TARGET_SYSTEM_PROP)
+
+ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
+else
+BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432
+endif

jelly_star/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<webviewproviders>
+    <!-- The default WebView implementation -->
+    <webviewprovider description="Vanadium" packageName="app.vanadium.webview" availableByDefault="true">
+    </webviewprovider>
+</webviewproviders>

jelly_star/system.prop

@@ -0,0 +1,11 @@
+# Fixed Bluetooth audio
+persist.bluetooth.bluetooth_audio_hal.disabled=true
+persist.sys.bt.unsupport.features=00000000
+persist.sys.bt.unsupport.states=00000000
+persist.sys.bt.unsupport.stdfeatures=000001
+qemu.hw.mainkeys=1
+hw.lcd.width = 480
+hw.lcd.height = 854
+hw.lcd.depth = 24
+hw.lcd.density = 220
+ro.sf.lcd_density=220

patches/calendar_test.patch

@@ -0,0 +1,12 @@
+diff --git a/build/tasks/tests/platform_test_list.mk b/build/tasks/tests/platform_test_list.mk
+index 5c5f70fa7..4669e2b44 100644
+--- a/build/tasks/tests/platform_test_list.mk
++++ b/build/tasks/tests/platform_test_list.mk
+@@ -20,7 +20,6 @@ platform_tests += \
+     BootHelperApp \
+     BusinessCard \
+     CalculatorFunctionalTests \
+-    CalendarTests \
+     camera_client_test \
+     camera_metadata_tests \
+     CellBroadcastReceiverTests \

patches/qsb_on_first_screen.patch

@@ -0,0 +1,13 @@
+diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
+index 33beacd4c0..bd2400ecbc 100644
+--- a/src/com/android/launcher3/config/FeatureFlags.java
++++ b/src/com/android/launcher3/config/FeatureFlags.java
+@@ -52,7 +52,7 @@ public final class FeatureFlags {
+      * Enable moving the QSB on the 0th screen of the workspace. This is not a configuration feature
+      * and should be modified at a project level.
+      */
+-    public static final boolean QSB_ON_FIRST_SCREEN = BuildConfig.QSB_ON_FIRST_SCREEN;
++    public static final boolean QSB_ON_FIRST_SCREEN = false;
+ 
+     /**
+      * Feature flag to handle define config changes dynamically instead of killing the process.

qinf21pro/AndroidProducts.mk

@@ -0,0 +1,2 @@
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/qinf21pro.mk 

qinf21pro/files/mtk-kpd.kcm

@@ -77,6 +77,7 @@ key 6 {
 key 7 {
     label:                              '7'
     base:                               '7'
+    fn:                                 '*'
 }
 
 key 8 {
@@ -87,4 +88,5 @@ key 8 {
 key 9 {
     label:                              '9'
     base:                               '9'
+    ctrl:                               '#'
 }

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

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+	<string-array translatable="false" name="config_tether_usb_regexs">
+		<item>"usb\\d"</item>
+		<item>"rndis\\d"</item>
+	</string-array>
+
+	<string-array translatable="false" name="config_tether_wifi_regexs">
+		<item>"wlan0"</item>
+		<item>"softap.*"</item>
+		<item>"wifi_br0"</item>
+		<item>"wigig0"</item>
+	</string-array>
+
+	<string-array translatable="false" name="config_tether_bluetooth_regexs">
+        <item>bnep\\d</item>
+		<item>"bt-pan"</item>
+	</string-array>
+
+	<bool name="config_enableAutoPowerModes">true</bool>
+	<bool name="config_intrusiveNotificationLed">true</bool>
+	<string name="config_icon_mask" translatable="false">"M50 0C77.6 0 100 22.4 100 50C100 77.6 77.6 100 50 100C22.4 100 0 77.6 0 50C0 22.4 22.4 0 50 0Z"</string>
+	<bool name="config_useRoundIcon">true</bool>
+
+	<string name="config_wallpaperCropperPackage">com.android.wallpaperpicker</string>
+	<bool name="config_unplugTurnsOnScreen">true</bool>
+	<integer name="config_multiuserMaximumUsers">5</integer>
+	<bool name="config_enableMultiUserUI">true</bool>
+
+	<string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
+	<bool name="config_swipe_up_gesture_setting_available">true</bool>
+	<bool name="config_smart_battery_available">true</bool>
+	<dimen name="config_dialogCornerRadius">8.0dip</dimen>
+	<dimen name="config_buttonCornerRadius">4.0dip</dimen>
+
+	<bool name="config_cellBroadcastAppLinks">true</bool>
+
+    <array name="config_availableColorModes">
+        <!-- ColorDisplayManager.COLOR_MODE_NATURAL -->
+        <item>0</item>
+        <!-- ColorDisplayManager.COLOR_MODE_BOOSTED -->
+        <item>1</item>
+        <!-- ColorDisplayManager.COLOR_MODE_SATURATED -->
+        <item>2</item>
+        <!-- ColorDisplayManager.COLOR_MODE_AUTOMATIC -->
+        <item>3</item>
+    </array>
+
+    <bool name="config_supportAudioSourceUnprocessed">true</bool>
+
+    <string name="config_displayLightSensorType" translatable="false">android.sensor.light</string>
+
+    <integer name="config_defaultNightMode">2</integer>
+    
+    <bool name="config_useDevInputEventForAudioJack">true</bool>
+</resources>

qinf21pro/patches/launcher3.patch

@@ -0,0 +1,25 @@
+diff --git a/res/layout/search_container_all_apps.xml b/res/layout/search_container_all_apps.xml
+index e1646ba43..850d86ccc 100644
+--- a/res/layout/search_container_all_apps.xml
++++ b/res/layout/search_container_all_apps.xml
+@@ -34,4 +34,5 @@
+     android:singleLine="true"
+     android:textColor="?android:attr/textColorSecondary"
+     android:textColorHint="@drawable/all_apps_search_hint"
+-    android:textSize="16sp" />
+\ No newline at end of file
++    android:textSize="16sp"
++    android:visibility="gone" />
+diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
+index 88a9abaf8..d4a65f05b 100644
+--- a/src/com/android/launcher3/config/FeatureFlags.java
++++ b/src/com/android/launcher3/config/FeatureFlags.java
+@@ -52,7 +52,7 @@ public final class FeatureFlags {
+      * Enable moving the QSB on the 0th screen of the workspace. This is not a configuration feature
+      * and should be modified at a project level.
+      */
+-    public static final boolean QSB_ON_FIRST_SCREEN = true;
++    public static final boolean QSB_ON_FIRST_SCREEN = false;
+ 
+     /**
+      * Feature flag to handle define config changes dynamically instead of killing the process.

qinf21pro/qinf21pro.mk

@@ -0,0 +1,59 @@
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.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
+#
+# ifeq (aosp_arm64,$(TARGET_PRODUCT))
+$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
+# endif
+
+PRODUCT_CHARACTERISTICS := device
+
+PRODUCT_NAME := qinf21pro
+PRODUCT_DEVICE := qinf21pro
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := DuoQin F21 pro WePhone
+PRODUCT_AAPT_CONFIG := normal
+PRODUCT_AAPT_PREF_CONFIG := xhdpi
+
+PRODUCT_PACKAGE_OVERLAYS += device/wephone/ttp/overlay
+
+PRODUCT_COPY_FILES += \
+	device/wephone/qinf21pro/files/mtk-kpd.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-kpd.idc \
+	device/wephone/qinf21pro/files/mtk-kpd.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/mtk-kpd.kcm \
+	device/wephone/qinf21pro/files/mtk-kpd.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-kpd.kl \
+	device/wephone/qinf21pro/files/mtk-pmic-keys.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-pmic-keys.idc \
+	device/wephone/qinf21pro/files/mtk-pmic-keys.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/mtk-pmic-keys.kcm \
+	device/wephone/qinf21pro/files/mtk-pmic-keys.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-pmic-keys.kl \
+	device/wephone/qinf21pro/files/Vendor_0001_Product_0001_Version_0100.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/Vendor_0001_Product_0001_Version_0100.kl
+
+# Use a more decent APN config
+PRODUCT_COPY_FILES += \
+	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
+
+ifneq (,$(wildcard external/exfat))
+PRODUCT_PACKAGES += \
+	mkfs.exfat \
+	fsck.exfat
+endif
+
+PRODUCT_PACKAGES += \
+	Contacts \
+	DeskClock \
+	Etar \
+	Gallery2 \
+	TrichromeWebView \
+	WKT9
+

qinf21pro/qinf21pro/BoardConfig.mk

@@ -0,0 +1,29 @@
+TARGET_ARCH := arm64
+TARGET_ARCH_VARIANT := armv8-a
+TARGET_CPU_ABI := arm64-v8a
+TARGET_CPU_ABI2 :=
+TARGET_CPU_VARIANT := generic
+
+TARGET_2ND_ARCH := arm
+TARGET_2ND_ARCH_VARIANT := armv8-a
+TARGET_2ND_CPU_ABI := armeabi-v7a
+TARGET_2ND_CPU_ABI2 := armeabi
+TARGET_2ND_CPU_VARIANT := generic
+
+include build/make/target/board/BoardConfigGsiCommon.mk
+
+# TODO(jiyong) These might be SoC specific.
+BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
+
+# TODO(b/36764215): remove this setting when the generic system image
+# no longer has QCOM-specific directories under /.
+BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy
+
+TARGET_EXFAT_DRIVER := exfat
+TARGET_SYSTEM_PROP := device/wephone/ttp/system.prop $(TARGET_SYSTEM_PROP)
+
+ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
+else
+BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432
+endif

qinf21pro/system.prop

@@ -0,0 +1,10 @@
+# Fixed Bluetooth audio
+persist.bluetooth.bluetooth_audio_hal.disabled=true
+persist.sys.bt.unsupport.features=00000000
+persist.sys.bt.unsupport.states=00000000
+persist.sys.bt.unsupport.stdfeatures=000001
+# VoLTE properties
+persist.dbg.vt_avail_ovr=1
+persist.dbg.volte_avail_ovr=1
+persist.dbg.wfc_avail_ovr=1
+persist.dbg.allow_ims_off=1

qinf22pro/AndroidProducts.mk

@@ -0,0 +1,2 @@
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/qinf22pro.mk

qinf22pro/board-base.mk

@@ -0,0 +1 @@
+TARGET_SYSTEM_PROP := device/wephone/qinf22pro/system.prop $(TARGET_SYSTEM_PROP)

qinf22pro/files/mtk-kpd.idc

@@ -0,0 +1,6 @@
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+device.internal = 1
+keyboard.layout = mtk-kpd
+keyboard.characterMap = mtk-kpd

qinf22pro/files/mtk-kpd.kcm

@@ -0,0 +1,92 @@
+type FULL
+
+key BUTTON_X {
+    base:                               fallback BACK
+    fn:                                 fallback HOME
+    ctrl:                               fallback APP_SWITCH
+}
+
+key BUTTON_Y {
+    base:                               fallback CALL
+    ctrl:                               fallback SYM
+}
+
+key BUTTON_Z {
+    base:                               fallback ENTER
+    fn:                                 fallback VOLUME_MUTE
+    ctrl:                               fallback SYSRQ
+}
+
+key BUTTON_1 {
+    base:                               fallback DPAD_UP
+    fn:                                 fallback VOLUME_UP
+}
+
+key BUTTON_2 {
+    base:                               fallback DPAD_LEFT
+    fn:                                 fallback BRIGHTNESS_DOWN
+}
+
+key BUTTON_3 {
+    base:                               fallback DPAD_RIGHT
+    fn:                                 fallback BRIGHTNESS_UP
+}
+
+key BUTTON_4 {
+    base:                               fallback DPAD_DOWN
+    fn:                                 fallback VOLUME_DOWN
+}
+
+key 0 {
+    label:                              '0'
+    base:                               '0'
+    fn:                                 '\n'
+    ctrl:                               '\t'
+}
+
+key 1 {
+    label:                              '1'
+    base:                               '1'
+}
+
+key 2 {
+    label:                              '2'
+    base:                               '2'
+}
+
+key 3 {
+    label:                              '3'
+    base:                               '3'
+}
+
+key 4 {
+    label:                              '4'
+    base:                               '4'
+}
+
+key 5 {
+    label:                              '5'
+    base:                               '5'
+}
+
+key 6 {
+    label:                              '6'
+    base:                               '6'
+}
+
+key 7 {
+    label:                              '7'
+    base:                               '7'
+    fn:                                 '*'
+}
+
+key 8 {
+    label:                              '8'
+    base:                               '8'
+}
+
+key 9 {
+    label:                              '9'
+    base:                               '9'
+    ctrl:                               '#'
+}

qinf22pro/files/mtk-kpd.kl

@@ -0,0 +1,49 @@
+key 2     1
+key 3     2
+key 4     3
+key 5     4
+key 6     5
+key 7     6
+key 8     7
+key 9     8
+key 10    9
+key 11    0
+
+# DPAD UP
+key 103   BUTTON_1
+
+# DPAD LEFT
+key 105   BUTTON_2
+
+# DPAD RIGHT
+key 106   BUTTON_3
+
+# DPAD DOWN
+key 108   BUTTON_4
+
+# Power button
+key 116   POWER
+
+# BACK
+key 158   BUTTON_X
+
+# CALL
+key 169   BUTTON_Y
+
+# DPAD CENTER
+key 353   BUTTON_Z
+
+# STAR
+key 522   FUNCTION
+
+# POUND
+key 523   CTRL_RIGHT
+
+# VOL DOWN
+key 114   VOLUME_DOWN
+
+# VOL UP
+key 115   VOLUME_UP
+
+# DELETE
+key 139   DEL

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

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+	<string-array translatable="false" name="config_tether_usb_regexs">
+		<item>"usb\\d"</item>
+		<item>"rndis\\d"</item>
+	</string-array>
+
+	<string-array translatable="false" name="config_tether_wifi_regexs">
+		<item>"wlan0"</item>
+		<item>"softap.*"</item>
+		<item>"wifi_br0"</item>
+		<item>"wigig0"</item>
+	</string-array>
+
+	<string-array translatable="false" name="config_tether_bluetooth_regexs">
+        <item>bnep\\d</item>
+		<item>"bt-pan"</item>
+	</string-array>
+
+	<bool name="config_enableAutoPowerModes">true</bool>
+	<bool name="config_intrusiveNotificationLed">true</bool>
+	<string name="config_icon_mask" translatable="false">"M50 0C77.6 0 100 22.4 100 50C100 77.6 77.6 100 50 100C22.4 100 0 77.6 0 50C0 22.4 22.4 0 50 0Z"</string>
+	<bool name="config_useRoundIcon">true</bool>
+
+	<string name="config_wallpaperCropperPackage">com.android.wallpaperpicker</string>
+	<bool name="config_unplugTurnsOnScreen">true</bool>
+	<integer name="config_multiuserMaximumUsers">5</integer>
+	<bool name="config_enableMultiUserUI">true</bool>
+
+	<string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
+	<bool name="config_swipe_up_gesture_setting_available">true</bool>
+	<bool name="config_smart_battery_available">true</bool>
+	<dimen name="config_dialogCornerRadius">8.0dip</dimen>
+	<dimen name="config_buttonCornerRadius">4.0dip</dimen>
+
+	<bool name="config_cellBroadcastAppLinks">true</bool>
+
+    <array name="config_availableColorModes">
+        <!-- ColorDisplayManager.COLOR_MODE_NATURAL -->
+        <item>0</item>
+        <!-- ColorDisplayManager.COLOR_MODE_BOOSTED -->
+        <item>1</item>
+        <!-- ColorDisplayManager.COLOR_MODE_SATURATED -->
+        <item>2</item>
+        <!-- ColorDisplayManager.COLOR_MODE_AUTOMATIC -->
+        <item>3</item>
+    </array>
+
+    <bool name="config_supportAudioSourceUnprocessed">true</bool>
+
+    <string name="config_displayLightSensorType" translatable="false">android.sensor.light</string>
+
+    <integer name="config_defaultNightMode">2</integer>
+    
+    <bool name="config_useDevInputEventForAudioJack">true</bool>
+</resources>

qinf22pro/patches/button_backlight.patch

@@ -1,8 +1,8 @@
 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
+index 6a57e4070f65..ae544b5e9d56 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;
+@@ -75,6 +75,10 @@ import com.android.server.display.whitebalance.DisplayWhiteBalanceFactory;
  import com.android.server.display.whitebalance.DisplayWhiteBalanceSettings;
  import com.android.server.policy.WindowManagerPolicy;
  
@@ -11,9 +11,9 @@ index 1224902aa7be..68855ebf06b9 100644
 +import com.android.server.lights.LogicalLight;
 +
  import java.io.PrintWriter;
+ import java.util.Objects;
  
- /**
+@@ -294,6 +298,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
-@@ -276,6 +280,10 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
      // Must only be accessed on the handler thread.
      private DisplayPowerState mPowerState;
  
@@ -24,7 +24,7 @@ index 1224902aa7be..68855ebf06b9 100644
      // 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
+@@ -895,6 +903,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
          mPowerState = new DisplayPowerState(mBlanker,
                  mColorFadeEnabled ? new ColorFade(mDisplayId) : null, mDisplayId, displayState);
  
@@ -34,7 +34,7 @@ index 1224902aa7be..68855ebf06b9 100644
          if (mColorFadeEnabled) {
              mColorFadeOnAnimator = ObjectAnimator.ofFloat(
                      mPowerState, DisplayPowerState.COLOR_FADE_LEVEL, 0.0f, 1.0f);
-@@ -1452,6 +1463,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -1677,6 +1688,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
                  && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_TURNING_ON) {
              setReportedScreenState(REPORTED_TO_POLICY_SCREEN_ON);
              mWindowManagerPolicy.screenTurnedOn(mDisplayId);
@@ -42,7 +42,7 @@ index 1224902aa7be..68855ebf06b9 100644
          }
  
          // Grab a wake lock if we have unfinished business.
-@@ -1652,6 +1664,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -1926,6 +1938,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
              setReportedScreenState(REPORTED_TO_POLICY_SCREEN_OFF);
              unblockScreenOn();
              mWindowManagerPolicy.screenTurnedOff(mDisplayId);
@@ -50,7 +50,7 @@ index 1224902aa7be..68855ebf06b9 100644
          } else if (!isOff
                  && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_TURNING_OFF) {
  
-@@ -1659,6 +1672,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+@@ -1933,6 +1946,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
              // Complete the full state transition on -> turningOff -> off.
              unblockScreenOff();
              mWindowManagerPolicy.screenTurnedOff(mDisplayId);

qinf22pro/patches/qsb.patch

@@ -0,0 +1,11 @@
+diff --git a/src_build_config/com/android/launcher3/BuildConfig.java b/src_build_config/com/android/launcher3/BuildConfig.java
+index 9a81d3f54c..8c83bcc372 100644
+--- a/src_build_config/com/android/launcher3/BuildConfig.java
++++ b/src_build_config/com/android/launcher3/BuildConfig.java
+@@ -23,5 +23,5 @@ public final class BuildConfig {
+      * Flag to state if the QSB is on the first screen and placed on the top,
+      * this can be overwritten in other launchers with a different value, if needed.
+      */
+-    public static final boolean QSB_ON_FIRST_SCREEN = true;
++    public static final boolean QSB_ON_FIRST_SCREEN = false;
+ }

qinf22pro/qinf22pro.mk

@@ -0,0 +1,48 @@
+TARGET_GAPPS_ARCH := arm64
+
+include device/generic/common/gsi_arm64.mk
+
+PRODUCT_NAME := qinf22pro
+PRODUCT_DEVICE := qinf22pro
+PRODUCT_BRAND := wephone
+PRODUCT_MODEL := weOs | v13.0.1 | Chanowk
+
+PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT :=
+PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS :=
+PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := false
+PRODUCT_BROKEN_VERIFY_USES_LIBRARIES := true
+QSB_ON_FIRST_SCREEN := false
+
+# This is for a device
+PRODUCT_CHARACTERISTICS := device
+
+PRODUCT_PACKAGE_OVERLAYS += device/wephone/qinf22pro/overlay
+
+PRODUCT_COPY_FILES += \
+	device/wephone/qinf22pro/files/mtk-kpd.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-kpd.idc \
+	device/wephone/qinf22pro/files/mtk-kpd.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/mtk-kpd.kcm \
+	device/wephone/qinf22pro/files/mtk-kpd.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-kpd.kl
+
+PRODUCT_PACKAGES += \
+	BromiteSystemWebView \
+	Conversations \
+	Davx5 \
+	DeskClock \
+	Etar \
+	ExactCalculator \
+	Gallery2 \
+	K-9Mail \
+	Linphone \
+	Nextcloud \
+	NextcloudNotes \
+	OpenDocumentReader \
+	Wireguard \
+	WKT9
+
+PRODUCT_PACKAGES -= \
+	EasterEgg \
+	webview \
+	libwebviewchromium_loader \
+	libwebviewchromium_plat_support \
+	CtsShimPrebuilt \
+	CtsShimPrivPrebuilt

qinf22pro/qinf22pro/BoardConfig.mk

@@ -0,0 +1,2 @@
+include build/make/target/board/generic_arm64/BoardConfig.mk
+include device/wephone/qinf22pro/board-base.mk

tryout/AndroidProducts.mk

@@ -0,0 +1,2 @@
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/tryout.mk 

tryout/board-base.mk

@@ -0,0 +1 @@
+TARGET_SYSTEM_PROP := device/wephone/qinf21pro/system.prop $(TARGET_SYSTEM_PROP)

tryout/tryout.mk

@@ -0,0 +1,30 @@
+#Use a more decent APN config
+PRODUCT_COPY_FILES += \
+        device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
+
+TARGET_GAPPS_ARCH := arm64
+
+include build/make/target/product/aosp_arm64_ab.mk
+
+PRODUCT_NAME := tryout
+PRODUCT_DEVICE := tryout
+PRODUCT_BRAND := wePhone
+PRODUCT_SYSTEM_BRAND := wePhone
+PRODUCT_MODEL := weOs | Tryout | Nehemiah
+
+# Overwrite the inherited "emulator" characteristics
+PRODUCT_CHARACTERISTICS := device
+
+PRODUCT_PACKAGE_OVERLAYS += device/wephone/qinf21pro/overlay
+
+PRODUCT_COPY_FILES += \
+	device/wephone/qinf21pro/files/mtk-kpd.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-kpd.idc \
+	device/wephone/qinf21pro/files/mtk-kpd.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/mtk-kpd.kcm \
+	device/wephone/qinf21pro/files/mtk-kpd.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-kpd.kl \
+	device/wephone/qinf21pro/files/mtk-pmic-keys.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-pmic-keys.idc \
+	device/wephone/qinf21pro/files/mtk-pmic-keys.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/mtk-pmic-keys.kcm \
+	device/wephone/qinf21pro/files/mtk-pmic-keys.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-pmic-keys.kl \
+	device/wephone/qinf21pro/files/Vendor_0001_Product_0001_Version_0100.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/Vendor_0001_Product_0001_Version_0100.kl
+
+PRODUCT_PACKAGES += \
+	ImsMtkR

tryout/tryout/BoardConfig.mk

@@ -1,5 +1,5 @@
 include build/make/target/board/generic_arm64_ab/BoardConfig.mk
-include device/wephone/duoqin/board-base.mk
+include device/wephone/tryout/board-base.mk
 
 ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
 BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648

ttp/AndroidProducts.mk

@@ -0,0 +1,2 @@
+PRODUCT_MAKEFILES := \
+    $(LOCAL_DIR)/ttp.mk

ttp/files/aw9523-key.idc

@@ -0,0 +1,14 @@
+# Agold add for A61 by guotuo
+
+device.internal = 1
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+keyboard.layout = aw9523-key.kl
+keyboard.characterMap = aw9523-key
+keyboard.orientationAware = 1
+keyboard.builtIn = 1
+
+cursor.mode = navigation
+cursor.orientationAware = 1

ttp/files/aw9523-key.kcm

@@ -0,0 +1,240 @@
+# Agold add for A61 by guotuo
+
+type ALPHA
+
+key A {
+    label:                              'A'
+    base:                               'a'
+    shift, capslock:                    'A'
+    alt:                                '@'
+    shift+alt, capslock+alt:            none
+}
+
+key B {
+    label:                              'B'
+    base:                               'b'
+    shift, capslock:                    'B'
+    alt:                                '.'
+    shift+alt, capslock+alt:            none
+}
+
+key C {
+    label:                              'C'
+    number:                             '8'
+    base:                               'c'
+    shift, capslock:                    'C'
+    alt:                                '8'
+    shift+alt, capslock+alt:            none
+}
+
+key D {
+    label:                              'D'
+    number:                             '5'
+    base:                               'd'
+    shift, capslock:                    'D'
+    alt:                                '5'
+    shift+alt, capslock+alt:            none
+}
+
+key E {
+    label:                              'E'
+    number:                             '2'
+    base:                               'e'
+    shift, capslock:                    'E'
+    alt:                                '2'
+    shift+alt, capslock+alt:            none
+}
+
+key F {
+    label:                              'F'
+    number:                             '6'
+    base:                               'f'
+    shift, capslock:                    'F'
+    alt:                                '6'
+    shift+alt, capslock+alt:            none
+}
+
+key G {
+    label:                              'G'
+    base:                               'g'
+    shift, capslock:                    'G'
+    alt:                                '*'
+    shift+alt, capslock+alt:            none
+}
+
+key H {
+    label:                              'H'
+    base:                               'h'
+    shift, capslock:                    'H'
+    alt:                                '#'
+    shift+alt, capslock+alt:            none
+}
+
+key I {
+    label:                              'I'
+    base:                               'i'
+    shift, capslock:                    'I'
+    alt:                                '_'
+    shift+alt, capslock+alt:            none
+}
+
+key J {
+    label:                              'J'
+    base:                               'j'
+    shift, capslock:                    'J'
+    alt:                                '+'
+    shift+alt, capslock+alt:            none
+}
+
+key K {
+    label:                              'K'
+    base:                               'k'
+    shift, capslock:                    'K'
+    alt:                                '"'
+    shift+alt, capslock+alt:            none
+}
+
+key L {
+    label:                              'L'
+    base:                               'l'
+    shift, capslock:                    'L'
+    alt:                                '\''
+    shift+alt, capslock+alt:            none
+}
+
+key M {
+    label:                              'M'
+    base:                               'm'
+    shift, capslock:                    'M'
+    alt:                                '?'
+    shift+alt, capslock+alt:            none
+}
+
+key N {
+    label:                              'N'
+    base:                               'n'
+    shift, capslock:                    'N'
+    alt:                                ','
+    shift+alt, capslock+alt:            none
+}
+
+key O {
+    label:                              'O'
+    base:                               'o'
+    shift, capslock:                    'O'
+    alt:                                '/'
+    shift+alt, capslock+alt:            none
+}
+
+key P {
+    label:                              'P'
+    base:                               'p'
+    shift, capslock:                    'P'
+    alt:                                ':'
+    shift+alt, capslock+alt:            none
+}
+
+key Q {
+    label:                              'Q'
+    number:                             '0'
+    base:                               'q'
+    shift, capslock:                    'Q'
+    alt:                                '0'
+    shift+alt, capslock+alt:            none
+}
+
+key R {
+    label:                              'R'
+    number:                             '3'
+    base:                               'r'
+    shift, capslock:                    'R'
+    alt:                                '3'
+    shift+alt, capslock+alt:            none
+}
+
+key S {
+    label:                              'S'
+    number:                             '4'
+    base:                               's'
+    shift, capslock:                    'S'
+    alt:                                '4'
+    shift+alt, capslock+alt:            none
+}
+
+key T {
+    label:                              'T'
+    base:                               't'
+    shift, capslock:                    'T'
+    alt:                                '('
+    shift+alt, capslock+alt:            none
+}
+
+key U {
+    label:                              'U'
+    base:                               'u'
+    shift, capslock:                    'U'
+    alt:                                '-'
+    shift+alt, capslock+alt:            none
+}
+
+key V {
+    label:                              'V'
+    number:                             '9'
+    base:                               'v'
+    shift, capslock:                    'V'
+    alt:                                '9'
+    shift+alt, capslock+alt:            none
+}
+
+key W {
+    label:                              'W'
+    number:                             '1'
+    base:                               'w'
+    shift, capslock:                    'W'
+    alt:                                '1'
+    shift+alt, capslock+alt:            none
+}
+
+key X {
+    label:                              'X'
+    number:                             '7'
+    base:                               'x'
+    shift, capslock:                    'X'
+    alt:                                '7'
+    shift+alt, capslock+alt:            none
+}
+
+key Y {
+    label:                              'Y'
+    base:                               'y'
+    shift, capslock:                    'Y'
+    alt:                                ')'
+    shift+alt, capslock+alt:            none
+}
+
+key Z {
+    label:                              'Z'
+    base:                               'z'
+    shift, capslock:                    'Z'
+    alt:                                '!'
+    shift+alt, capslock+alt:            none
+}
+
+key SPACE {
+    label:                              ' '
+    number:                             ' '
+    base:                               ' '
+    shift:                              ' '
+    alt:                                '\uef01'
+    shift+alt:                          '\uef01'
+}
+
+key ENTER {
+    label:                              '\n'
+    number:                             '\n'
+    base:                               '\n'
+    shift:                              '\n'
+    alt:                                '\n'
+    shift+alt:                          '\n'
+}
+

ttp/files/aw9523-key.kl

@@ -0,0 +1,105 @@
+key 399   GRAVE
+key 2     1
+key 3     2
+key 4     3
+key 5     4
+key 6     5
+key 7     6
+key 8     7
+key 9     8
+key 10    9
+key 11    0
+key 158   BACK
+key 230   SOFT_RIGHT
+key 60    SOFT_RIGHT
+key 107   ENDCALL
+key 62    ENDCALL
+key 229   MENU
+key 139   MENU
+key 59    MENU
+key 127   SYM
+key 217   SEARCH
+key 228   POUND
+key 227   STAR
+key 231   CALL
+key 61    CALL
+key 232   DPAD_CENTER
+key 108   DPAD_DOWN
+key 103   DPAD_UP
+key 102   HOME
+key 105   DPAD_LEFT
+key 106   DPAD_RIGHT
+key 115   VOLUME_UP
+key 114   VOLUME_DOWN
+key 113   MUTE
+key 116   POWER
+key 212   CAMERA
+key 211   FOCUS
+
+key 16    Q
+key 17    W
+key 18    E
+key 19    R
+key 20    T
+key 21    Y
+key 22    U
+key 23    I
+key 24    O
+key 25    P
+key 26    LEFT_BRACKET
+key 27    RIGHT_BRACKET
+key 43    BACKSLASH
+
+key 30    A
+key 31    S
+key 32    D
+key 33    F
+key 34    G
+key 35    H
+key 36    J
+key 37    K
+key 38    L
+key 39    SEMICOLON
+key 40    APOSTROPHE
+key 14    DEL
+
+key 44    Z
+key 45    X
+key 46    C
+key 47    V
+key 48    B
+key 49    N
+key 50    M
+key 51    COMMA
+key 52    PERIOD
+key 53    SLASH
+key 28    ENTER
+
+key 56    ALT_LEFT
+key 100   ALT_RIGHT
+key 42    SHIFT_LEFT
+key 54    SHIFT_RIGHT
+key 15    TAB
+key 57    SPACE
+key 150   EXPLORER
+key 155   ENVELOPE
+
+key 12    MINUS
+key 13    EQUALS
+key 215   AT
+
+key 164   MEDIA_PLAY_PAUSE
+key 128   MEDIA_STOP
+key 163   MEDIA_NEXT
+key 165   MEDIA_PREVIOUS
+key 168   MEDIA_REWIND
+key 159   MEDIA_FAST_FORWARD
+
+# agold add
+key 249   FUNC1
+key 250   FUNC2
+# add for a83 function key
+key 183   FUNC1
+
+key 580   APP_SWITCH
+

ttp/files/excluded-input-devices.xml

@@ -0,0 +1 @@
+<devices><device name="mtk-pad"/></devices>

ttp/files/fingerprint_key.kl

@@ -0,0 +1,3 @@
+# Key layout for Unihertz devices with fingerprint sensor
+# For Atom {,L,XL}: fingerprint sensor as home
+key 172   HOME   VIRTUAL

ttp/files/mtk-kpd.idc

@@ -0,0 +1,31 @@
+# Copyright (C) 2010 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.
+
+#
+# Emulator keyboard configuration file #2.
+#
+
+touch.deviceType = touchScreen
+touch.orientationAware = 1
+
+keyboard.layout = mtk-kpd
+keyboard.characterMap = qwerty
+keyboard.orientationAware = 1
+
+# AGOLD zhangyongjiang modify from 1 to 0 for a66/a83.
+keyboard.builtIn = 0
+
+cursor.mode = navigation
+cursor.orientationAware = 1
+

ttp/files/mtk-kpd.kl

@@ -0,0 +1,13 @@
+# Keylayout for Unihertz devices with a dedicated PTT button
+# Volume buttons
+key 115   VOLUME_UP
+key 114   VOLUME_DOWN
+
+# Power button
+key 116   POWER
+
+# PTT - Remap to camera by default
+# CAMERA is delivered to apps, so remapping via
+# third-party apps is possible
+key 249   CAMERA
+key 250   CAMERA

ttp/files/mtk-pad.idc

@@ -0,0 +1,22 @@
+# Copyright (C) 2010 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.
+
+#
+# Emulator keyboard configuration file #2.
+#
+
+touch.deviceType = touchPad
+touch.orientationAware = 1
+
+

ttp/files/mtk-tpd.kl

@@ -0,0 +1,6 @@
+# Keylayout for Unihertz devices with capacitive keys
+# Capacitive navigation
+key 172   HOME        VIRTUAL
+key 580   APP_SWITCH  VIRTUAL
+key 158   BACK        VIRTUAL
+

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

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+	<string-array translatable="false" name="config_tether_usb_regexs">
+		<item>"usb\\d"</item>
+		<item>"rndis\\d"</item>
+	</string-array>
+
+	<string-array translatable="false" name="config_tether_wifi_regexs">
+		<item>"wlan0"</item>
+		<item>"softap.*"</item>
+		<item>"wifi_br0"</item>
+		<item>"wigig0"</item>
+	</string-array>
+
+	<string-array translatable="false" name="config_tether_bluetooth_regexs">
+        <item>bnep\\d</item>
+		<item>"bt-pan"</item>
+	</string-array>
+
+	<bool name="config_enableAutoPowerModes">true</bool>
+	<bool name="config_intrusiveNotificationLed">true</bool>
+	<string name="config_icon_mask" translatable="false">"M50 0C77.6 0 100 22.4 100 50C100 77.6 77.6 100 50 100C22.4 100 0 77.6 0 50C0 22.4 22.4 0 50 0Z"</string>
+	<bool name="config_useRoundIcon">true</bool>
+
+	<string name="config_wallpaperCropperPackage">com.android.wallpaperpicker</string>
+	<bool name="config_unplugTurnsOnScreen">true</bool>
+	<integer name="config_multiuserMaximumUsers">5</integer>
+	<bool name="config_enableMultiUserUI">true</bool>
+
+	<string name="config_dozeComponent">com.android.systemui/com.android.systemui.doze.DozeService</string>
+	<bool name="config_swipe_up_gesture_setting_available">true</bool>
+	<bool name="config_smart_battery_available">true</bool>
+	<dimen name="config_dialogCornerRadius">8.0dip</dimen>
+	<dimen name="config_buttonCornerRadius">4.0dip</dimen>
+
+	<bool name="config_cellBroadcastAppLinks">true</bool>
+
+    <array name="config_availableColorModes">
+        <!-- ColorDisplayManager.COLOR_MODE_NATURAL -->
+        <item>0</item>
+        <!-- ColorDisplayManager.COLOR_MODE_BOOSTED -->
+        <item>1</item>
+        <!-- ColorDisplayManager.COLOR_MODE_SATURATED -->
+        <item>2</item>
+        <!-- ColorDisplayManager.COLOR_MODE_AUTOMATIC -->
+        <item>3</item>
+    </array>
+
+    <bool name="config_supportAudioSourceUnprocessed">true</bool>
+
+    <string name="config_displayLightSensorType" translatable="false">android.sensor.light</string>
+
+    <integer name="config_defaultNightMode">2</integer>
+    
+    <bool name="config_useDevInputEventForAudioJack">true</bool>
+</resources>

ttp/overlay/frameworks/base/core/res/res/xml/config_webview_packages.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2015 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.
+-->
+
+<webviewproviders>
+    <!-- The default WebView implementation -->
+    <webviewprovider description="Vanadium" packageName="app.vanadium.webview" availableByDefault="true">
+    </webviewprovider>
+</webviewproviders>

ttp/patches/button_backlights.patch

@@ -0,0 +1,60 @@
+diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
+index 7c0f4197363..a46b96ae5fa 100644
+--- a/services/core/java/com/android/server/display/DisplayPowerController.java
++++ b/services/core/java/com/android/server/display/DisplayPowerController.java
+@@ -63,6 +63,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;
+ import java.util.List;
+ 
+@@ -258,6 +262,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
+@@ -686,6 +694,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+         mPowerState = new DisplayPowerState(mBlanker,
+                 mColorFadeEnabled ? new ColorFade(Display.DEFAULT_DISPLAY) : null);
+ 
++        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);
+@@ -1154,6 +1165,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+                 && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_TURNING_ON) {
+             setReportedScreenState(REPORTED_TO_POLICY_SCREEN_ON);
+             mWindowManagerPolicy.screenTurnedOn();
++	    mButtonsLight.setBrightness(PowerManager.BRIGHTNESS_MAX);
+         }
+ 
+         // Grab a wake lock if we have unfinished business.
+@@ -1310,6 +1322,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+             setReportedScreenState(REPORTED_TO_POLICY_SCREEN_OFF);
+             unblockScreenOn();
+             mWindowManagerPolicy.screenTurnedOff();
++	    mButtonsLight.setBrightness(PowerManager.BRIGHTNESS_OFF_FLOAT);
+         } else if (!isOff
+                 && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_TURNING_OFF) {
+ 
+@@ -1317,6 +1330,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
+             // Complete the full state transition on -> turningOff -> off.
+             unblockScreenOff();
+             mWindowManagerPolicy.screenTurnedOff();
++	    mButtonsLight.setBrightness(PowerManager.BRIGHTNESS_OFF_FLOAT);
+             setReportedScreenState(REPORTED_TO_POLICY_SCREEN_OFF);
+         }
+         if (!isOff && mReportedScreenStateToPolicy == REPORTED_TO_POLICY_SCREEN_OFF) {

ttp/patches/remove_launcher3_qsb.patch

@@ -0,0 +1,13 @@
+diff --git a/src/com/android/launcher3/config/FeatureFlags.java b/src/com/android/launcher3/config/FeatureFlags.java
+index 88a9abaf8d..d4a65f05bb 100644
+--- a/src/com/android/launcher3/config/FeatureFlags.java
++++ b/src/com/android/launcher3/config/FeatureFlags.java
+@@ -52,7 +52,7 @@ public final class FeatureFlags {
+      * Enable moving the QSB on the 0th screen of the workspace. This is not a configuration feature
+      * and should be modified at a project level.
+      */
+-    public static final boolean QSB_ON_FIRST_SCREEN = true;
++    public static final boolean QSB_ON_FIRST_SCREEN = false;
+ 
+     /**
+      * Feature flag to handle define config changes dynamically instead of killing the process.

ttp/system.prop

@@ -0,0 +1,11 @@
+# Fixed Bluetooth audio
+persist.bluetooth.bluetooth_audio_hal.disabled=true
+persist.sys.bt.unsupport.features=00000000
+persist.sys.bt.unsupport.states=00000000
+persist.sys.bt.unsupport.stdfeatures=000001
+qemu.hw.mainkeys=1
+hw.lcd.width = 716
+hw.lcd.height = 720
+hw.lcd.depth = 24
+hw.lcd.density = 220
+ro.sf.lcd_density=220

ttp/titan_pocket/BoardConfig.mk

@@ -0,0 +1,29 @@
+TARGET_ARCH := arm64
+TARGET_ARCH_VARIANT := armv8-a
+TARGET_CPU_ABI := arm64-v8a
+TARGET_CPU_ABI2 :=
+TARGET_CPU_VARIANT := generic
+
+TARGET_2ND_ARCH := arm
+TARGET_2ND_ARCH_VARIANT := armv8-a
+TARGET_2ND_CPU_ABI := armeabi-v7a
+TARGET_2ND_CPU_ABI2 := armeabi
+TARGET_2ND_CPU_VARIANT := generic
+
+include build/make/target/board/BoardConfigGsiCommon.mk
+
+# TODO(jiyong) These might be SoC specific.
+BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp
+
+# TODO(b/36764215): remove this setting when the generic system image
+# no longer has QCOM-specific directories under /.
+BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy
+
+TARGET_EXFAT_DRIVER := exfat
+TARGET_SYSTEM_PROP := device/wephone/ttp/system.prop $(TARGET_SYSTEM_PROP)
+
+ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),)
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
+else
+BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432
+endif

ttp/ttp.mk

@@ -0,0 +1,70 @@
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.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
+#
+# ifeq (aosp_arm64,$(TARGET_PRODUCT))
+$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk)
+# endif
+
+PRODUCT_CHARACTERISTICS := device
+DEVICE_TYPE := phone
+DEVICE_ORIENTATION := portrait
+DEVICE_LAYOUT_DIRECTION := ltr
+TARGET_SCREEN_WIDTH := 720
+TARGET_SCREEN_HEIGHT := 720
+TARGET_DENSITY := mdpi
+
+PRODUCT_NAME := ttp
+PRODUCT_DEVICE := titan_pocket
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := AOSP on ARM64
+
+PRODUCT_PACKAGE_OVERLAYS += device/wephone/ttp/overlay
+
+PRODUCT_COPY_FILES += \
+	device/wephone/ttp/files/excluded-input-devices.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/excluded-input-devices.xml \
+	device/wephone/ttp/files/aw9523-key.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/aw9523-key.idc \
+	device/wephone/ttp/files/aw9523-key.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/aw9523-key.kcm \
+	device/wephone/ttp/files/aw9523-key.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/aw9523-key.kl \
+	device/wephone/ttp/files/mtk-kpd.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-kpd.idc \
+	device/wephone/ttp/files/mtk-kpd.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-kpd.kl \
+	device/wephone/ttp/files/mtk-pad.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-pad.idc \
+	device/wephone/ttp/files/mtk-tpd.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-tpd.kl \
+	device/wephone/ttp/files/fingerprint_key.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/fingerprint_key.kl
+
+# Use a more decent APN config
+PRODUCT_COPY_FILES += \
+	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
+
+ifneq (,$(wildcard external/exfat))
+PRODUCT_PACKAGES += \
+	mkfs.exfat \
+	fsck.exfat
+endif
+
+PRODUCT_PACKAGES += \
+	Contacts \
+	DeskClock \
+	Etar \
+	Gallery2 \
+	TrichromeWebView \
+	WeKey
+
+PRODUCT_PACKAGES -= \
+	EasterEgg \
+	webview \
+	libwebviewchromium_loader \
+	libwebviewchromium_plat_support