From 793385eb7ea5b5c1c2807c86f53ed89ac0486ed1 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@gmail.com>
Date: Thu, 4 Jun 2015 21:42:46 +0300
Subject: [PATCH] Move LatinIME to phone/tablet configs

* Move LatinIME & dictionary overlay to exclude it from TV devices

Change-Id: I926fe0a2c24ee3d2c807e1f584a37d57f1cbb8b5
---
 config/common.mk                      | 1 -
 config/common_full.mk                 | 3 ---
 config/common_full_phone.mk           | 7 +++++++
 config/common_full_tablet_wifionly.mk | 7 +++++++
 config/common_mini_phone.mk           | 4 ++++
 config/common_mini_tablet_wifionly.mk | 4 ++++
 6 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/config/common.mk b/config/common.mk
index af6f8e4e..cfd735df 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -126,7 +126,6 @@ include vendor/cm/config/themes_common.mk
 # Required CM packages
 PRODUCT_PACKAGES += \
     Development \
-    LatinIME \
     BluetoothExt \
     Profiles
 
diff --git a/config/common_full.mk b/config/common_full.mk
index 4d60e5e2..14eadc71 100644
--- a/config/common_full.mk
+++ b/config/common_full.mk
@@ -4,9 +4,6 @@ $(call inherit-product, vendor/cm/config/common.mk)
 # Include CM audio files
 include vendor/cm/config/cm_audio.mk
 
-# Include CM LatinIME dictionaries
-PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/dictionaries
-
 # Optional CM packages
 PRODUCT_PACKAGES += \
     Galaxy4 \
diff --git a/config/common_full_phone.mk b/config/common_full_phone.mk
index de2067a0..252fe54b 100644
--- a/config/common_full_phone.mk
+++ b/config/common_full_phone.mk
@@ -1,6 +1,13 @@
 # Inherit common CM stuff
 $(call inherit-product, vendor/cm/config/common_full.mk)
 
+# Required CM packages
+PRODUCT_PACKAGES += \
+    LatinIME
+
+# Include CM LatinIME dictionaries
+PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/dictionaries
+
 # Default notification/alarm sounds
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.config.notification_sound=Argon.ogg \
diff --git a/config/common_full_tablet_wifionly.mk b/config/common_full_tablet_wifionly.mk
index f7689b7e..eb804ba6 100644
--- a/config/common_full_tablet_wifionly.mk
+++ b/config/common_full_tablet_wifionly.mk
@@ -1,6 +1,13 @@
 # Inherit common CM stuff
 $(call inherit-product, vendor/cm/config/common_full.mk)
 
+# Required CM packages
+PRODUCT_PACKAGES += \
+    LatinIME
+
+# Include CM LatinIME dictionaries
+PRODUCT_PACKAGE_OVERLAYS += vendor/cm/overlay/dictionaries
+
 # Default notification/alarm sounds
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.config.notification_sound=Argon.ogg \
diff --git a/config/common_mini_phone.mk b/config/common_mini_phone.mk
index 956bb380..da0c5f19 100644
--- a/config/common_mini_phone.mk
+++ b/config/common_mini_phone.mk
@@ -4,6 +4,10 @@ $(call inherit-product, vendor/cm/config/common.mk)
 # Include CM audio files
 include vendor/cm/config/cm_audio.mk
 
+# Required CM packages
+PRODUCT_PACKAGES += \
+    LatinIME
+
 # Default notification/alarm sounds
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.config.notification_sound=Argon.ogg \
diff --git a/config/common_mini_tablet_wifionly.mk b/config/common_mini_tablet_wifionly.mk
index 57256ed4..4eccd948 100644
--- a/config/common_mini_tablet_wifionly.mk
+++ b/config/common_mini_tablet_wifionly.mk
@@ -4,6 +4,10 @@ $(call inherit-product, vendor/cm/config/common.mk)
 # Include CM audio files
 include vendor/cm/config/cm_audio.mk
 
+# Required CM packages
+PRODUCT_PACKAGES += \
+    LatinIME
+
 # Default notification/alarm sounds
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.config.notification_sound=Argon.ogg \