Move LatinIME to phone/tablet configs
* Move LatinIME & dictionary overlay to exclude it from TV devices
Change-Id: I926fe0a2c24ee3d2c807e1f584a37d57f1cbb8b5
diff --git a/config/common.mk b/config/common.mk
index af6f8e4..cfd735d 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -126,7 +126,6 @@
# Required CM packages
PRODUCT_PACKAGES += \
Development \
- LatinIME \
BluetoothExt \
Profiles
diff --git a/config/common_full.mk b/config/common_full.mk
index 4d60e5e..14eadc7 100644
--- a/config/common_full.mk
+++ b/config/common_full.mk
@@ -4,9 +4,6 @@
# 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 de2067a..252fe54 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 f7689b7..eb804ba 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 956bb38..da0c5f1 100644
--- a/config/common_mini_phone.mk
+++ b/config/common_mini_phone.mk
@@ -4,6 +4,10 @@
# 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 57256ed..4eccd94 100644
--- a/config/common_mini_tablet_wifionly.mk
+++ b/config/common_mini_tablet_wifionly.mk
@@ -4,6 +4,10 @@
# 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 \