From 07ac8003d893b2e2c87351c0832f3aa1b5f62cee Mon Sep 17 00:00:00 2001
From: Dane Wagner <dane.wagner@gmail.com>
Date: Sun, 29 May 2011 16:33:20 -0500
Subject: [PATCH] Add morrison (Motorola CLIQ/DEXT) support

Device files can be pulled from https://github.com/dpw13/ngiordano-csolanol_Morrison_Device
Vendor files (including proprietary) can be pulled from https://github.com/adumont/vendor_morrison

Add dwagner, ngiordano, JassyCliq as maintainers for CLIQ/DEXT.

Change-Id: Ia6b561b511ee1ceb8104bcefa8f76fbf07549714
---
 CHANGELOG.mkdn                                |  1 +
 .../apps/CMParts/res/values/config.xml        |  8 ++++
 products/AndroidProducts.mk                   |  1 +
 products/cyanogen_morrison.mk                 | 45 +++++++++++++++++++
 vendorsetup.sh                                |  1 +
 5 files changed, 56 insertions(+)
 create mode 100644 overlay/morrison/packages/apps/CMParts/res/values/config.xml
 create mode 100644 products/cyanogen_morrison.mk

diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 035ce963..c4b2dfc8 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -35,6 +35,7 @@ Maintainers:
 * Encore (Nook Color): dalingrin, cvpcs, nemith, cicada, fattire
 * Speedy: toastcfh
 * Zeppelin (CLIQ XT/Quench): firesnatch, turl
+* Morrison (CLIQ/DEXT): ngiordano, dwagner, JassyCliq
 
 Translators:
 ------------
diff --git a/overlay/morrison/packages/apps/CMParts/res/values/config.xml b/overlay/morrison/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 00000000..913a3dbe
--- /dev/null
+++ b/overlay/morrison/packages/apps/CMParts/res/values/config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Whether or not to display the trackball settings -->
+    <bool name="has_trackball">false</bool>
+    <bool name="has_camera_button">true</bool>
+    <bool name="has_rgb_notification_led">false</bool>
+    <bool name="has_led_flash">true</bool>
+</resources>
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 7c160eaa..745a66b6 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -22,6 +22,7 @@ PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/cyanogen_leo.mk \
     $(LOCAL_DIR)/cyanogen_liberty.mk \
     $(LOCAL_DIR)/cyanogen_mecha.mk \
+    $(LOCAL_DIR)/cyanogen_morrison.mk \
     $(LOCAL_DIR)/cyanogen_one.mk \
     $(LOCAL_DIR)/cyanogen_p990.mk \
     $(LOCAL_DIR)/cyanogen_p999.mk \
diff --git a/products/cyanogen_morrison.mk b/products/cyanogen_morrison.mk
new file mode 100644
index 00000000..597e99ed
--- /dev/null
+++ b/products/cyanogen_morrison.mk
@@ -0,0 +1,45 @@
+# Inherit AOSP device configuration for zeppelin.
+$(call inherit-product, device/motorola/morrison/morrison.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+$(call inherit-product vendor/cyanogen/products/bcm_fm_radio.mk)
+
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_morrison
+PRODUCT_BRAND := motorola
+PRODUCT_DEVICE := morrison
+PRODUCT_MODEL := CLIQ
+PRODUCT_MANUFACTURER := Motorola
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+    PRODUCT_PROPERTY_OVERRIDES += \
+        ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-CLIQ
+else
+    ifdef CYANOGEN_RELEASE
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-CLIQ-KANG
+    else
+        PRODUCT_PROPERTY_OVERRIDES += \
+            ro.modversion=CyanogenMod-7.1.0-RC0-CLIQ-KANG
+    endif
+endif
+
+#PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=FRG83D BUILD_DISPLAY_ID=GRH78 PRODUCT_NAME=morrison TARGET_DEVICE=morrison BUILD_FINGERPRINT=MOTO/morrison_tmo_us/morr/morr:2.1-update1/ERD79/2.1.54:user/ota-rel-keys,release-keys PRODUCT_BRAND=tmobile PRIVATE_BUILD_DESC="morrison-user 2.1-update1 ERD79 2.1.54 ota-rel-keys,release-keys" BUILD_NUMBER=75603 BUILD_UTC_DATE=1289367602 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=android-build
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=morrison TARGET_DEVICE=morrison BUILD_ID=GRH78 BUILD_DISPLAY_ID=GRH78C BUILD_FINGERPRINT=google/soju/crespo:2.3.1/GRH78/85442:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.1 GRH78 85442 release-keys"
+
+PRODUCT_COPY_FILES +=  \
+    vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
+
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/morrison
+
+# Add the FM app
+PRODUCT_PACKAGES += FM
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 0627dfae..fe0ea918 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -21,6 +21,7 @@ add_lunch_combo cyanogen_legend-eng
 add_lunch_combo cyanogen_leo-eng
 add_lunch_combo cyanogen_liberty-eng
 add_lunch_combo cyanogen_mecha-eng
+add_lunch_combo cyanogen_morrison-eng
 add_lunch_combo cyanogen_one-eng
 add_lunch_combo cyanogen_p990-eng
 add_lunch_combo cyanogen_p999-eng