From dfc84b2c21a404265e25693c927cc978f5571747 Mon Sep 17 00:00:00 2001
From: harvey186 <harvey186@hotmail.com>
Date: Sat, 1 Feb 2025 13:02:51 +0100
Subject: [PATCH] Keyboard

Change-Id: Ia0ba9d920bd62c29b6f7092bbb9e3b961ccd1699
---
 core/sysprop.mk                                             | 3 +++
 target/product/core_64_bit.mk                               | 3 +++
 target/product/core_64_bit_only.mk                          | 2 ++
 target/product/core_minimal.mk                              | 3 +++
 target/product/handheld_product.mk                          | 1 -
 .../preinstalled-packages-platform-handheld-product.xml     | 6 ------
 6 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/target/product/core_64_bit.mk b/target/product/core_64_bit.mk
index 790f57b..1677b1b 100644
--- a/target/product/core_64_bit.mk
+++ b/target/product/core_64_bit.mk
@@ -35,3 +35,6 @@ endif
 
 TARGET_SUPPORTS_32_BIT_APPS := true
 TARGET_SUPPORTS_64_BIT_APPS := true
+
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.com.android.inputmethod.latin=org.futo.inputmethod.latin/.LatinIME

diff --git a/target/product/core_minimal.mk b/target/product/core_minimal.mk
index 6fb1173..c8e8c1e 100644
--- a/target/product/core_minimal.mk
+++ b/target/product/core_minimal.mk
@@ -29,3 +29,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/media_product.mk)
 PRODUCT_BRAND := generic
 PRODUCT_DEVICE := generic
 PRODUCT_NAME := core
+
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.com.android.inputmethod.latin=org.futo.inputmethod.latin/.LatinIME
diff --git a/target/product/handheld_product.mk b/target/product/handheld_product.mk
index 8755ae6..1ade376 100644
--- a/target/product/handheld_product.mk
+++ b/target/product/handheld_product.mk
@@ -28,7 +28,6 @@ PRODUCT_PACKAGES += \
     Contacts \
     DeskClock \
     Gallery2 \
-    LatinIME \
     Music \
     preinstalled-packages-platform-handheld-product.xml \
     QuickSearchBox \
diff --git a/target/product/sysconfig/preinstalled-packages-platform-handheld-product.xml b/target/product/sysconfig/preinstalled-packages-platform-handheld-product.xml
index 536c35b..2ce5c2f 100644
--- a/target/product/sysconfig/preinstalled-packages-platform-handheld-product.xml
+++ b/target/product/sysconfig/preinstalled-packages-platform-handheld-product.xml
@@ -17,12 +17,6 @@
      Documentation at frameworks/base/data/etc/preinstalled-packages-platform.xml
 -->
 <config>
-    <!--  Android Keyboard (AOSP) (LatinIME) TODO(b/258055479) -->
-    <install-in-user-type package="com.android.inputmethod.latin">
-        <install-in user-type="SYSTEM" />
-        <install-in user-type="FULL" />
-        <install-in user-type="PROFILE" />
-    </install-in-user-type>
 
     <!--  Calendar  -->
     <install-in-user-type package="com.android.calendar">
-- 
2.34.1