Merge "add US Cellular Mesmerize(mtd) and Cellular South Showcase(mtd) devices" into gingerbread
diff --git a/overlay/mesmerizemtd/frameworks/base/core/res/res/values/config.xml b/overlay/mesmerizemtd/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 0000000..8b667e7
--- /dev/null
+++ b/overlay/mesmerizemtd/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, 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.
+*/
+-->
+<resources>
+
+ <!-- Component name of the default wallpaper. This will be ImageWallpaper if not
+ specified -->
+ <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
+
+</resources>
diff --git a/overlay/mesmerizemtd/packages/apps/CMParts/res/values/config.xml b/overlay/mesmerizemtd/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 0000000..357f4bf
--- /dev/null
+++ b/overlay/mesmerizemtd/packages/apps/CMParts/res/values/config.xml
@@ -0,0 +1,9 @@
+<?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_rgb_notification_led">false</bool>
+ <bool name="has_camera_button">false</bool>
+ <bool name="has_led_flash">true</bool>
+ <bool name="has_search_button">true</bool>
+</resources>
diff --git a/overlay/showcasemtd/frameworks/base/core/res/res/values/config.xml b/overlay/showcasemtd/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 0000000..8b667e7
--- /dev/null
+++ b/overlay/showcasemtd/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2009, 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.
+*/
+-->
+<resources>
+
+ <!-- Component name of the default wallpaper. This will be ImageWallpaper if not
+ specified -->
+ <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
+
+</resources>
diff --git a/overlay/showcasemtd/packages/apps/CMParts/res/values/config.xml b/overlay/showcasemtd/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 0000000..357f4bf
--- /dev/null
+++ b/overlay/showcasemtd/packages/apps/CMParts/res/values/config.xml
@@ -0,0 +1,9 @@
+<?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_rgb_notification_led">false</bool>
+ <bool name="has_camera_button">false</bool>
+ <bool name="has_led_flash">true</bool>
+ <bool name="has_search_button">true</bool>
+</resources>
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index cd3d55b..92f9d48 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -28,6 +28,7 @@
$(LOCAL_DIR)/cyanogen_leo.mk \
$(LOCAL_DIR)/cyanogen_liberty.mk \
$(LOCAL_DIR)/cyanogen_mecha.mk \
+ $(LOCAL_DIR)/cyanogen_mesmerizemtd.mk \
$(LOCAL_DIR)/cyanogen_morrison.mk \
$(LOCAL_DIR)/cyanogen_one.mk \
$(LOCAL_DIR)/cyanogen_p990.mk \
@@ -35,6 +36,7 @@
$(LOCAL_DIR)/cyanogen_passion.mk \
$(LOCAL_DIR)/cyanogen_shadow.mk \
$(LOCAL_DIR)/cyanogen_sholes.mk \
+ $(LOCAL_DIR)/cyanogen_showcasemtd.mk \
$(LOCAL_DIR)/cyanogen_smb_a1002.mk \
$(LOCAL_DIR)/cyanogen_smb_a1004.mk \
$(LOCAL_DIR)/cyanogen_smb_a1011.mk \
diff --git a/products/cyanogen_mesmerizemtd.mk b/products/cyanogen_mesmerizemtd.mk
new file mode 100644
index 0000000..754af54
--- /dev/null
+++ b/products/cyanogen_mesmerizemtd.mk
@@ -0,0 +1,40 @@
+# Inherit AOSP device configuration for mesmerizemtd.
+$(call inherit-product, device/samsung/mesmerizemtd/full_mesmerizemtd.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_mesmerizemtd
+PRODUCT_BRAND := samsung
+PRODUCT_DEVICE := mesmerizemtd
+PRODUCT_MODEL := SCH-I500
+PRODUCT_MANUFACTURER := samsung
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ90 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys"
+
+# Extra mesmerizemtd overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/mesmerizemtd
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Mesmerize
+else
+ ifdef CYANOGEN_RELEASE
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=CyanogenMod-7.1.0-Mesmerize
+ else
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=CyanogenMod-7.1.0-Mesmerize-KANG-$(shell date +%m%d)
+ endif
+endif
+
+#
+# Copy galaxys specific prebuilt files
+#
+PRODUCT_COPY_FILES += \
+ vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_showcasemtd.mk b/products/cyanogen_showcasemtd.mk
new file mode 100644
index 0000000..0e7e7f5
--- /dev/null
+++ b/products/cyanogen_showcasemtd.mk
@@ -0,0 +1,40 @@
+# Inherit AOSP device configuration for showcasemtd.
+$(call inherit-product, device/samsung/showcasemtd/full_showcasemtd.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_showcasemtd
+PRODUCT_BRAND := samsung
+PRODUCT_DEVICE := showcasemtd
+PRODUCT_MODEL := SCH-I500
+PRODUCT_MANUFACTURER := samsung
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=soju BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ90 BUILD_FINGERPRINT=google/soju/crespo:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="soju-user 2.3.4 GRJ22 121341 release-keys"
+
+# Extra showcasemtd overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/showcasemtd
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-Showcase
+else
+ ifdef CYANOGEN_RELEASE
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=CyanogenMod-7.1.0-Showcase
+ else
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=CyanogenMod-7.1.0-Showcase-KANG-$(shell date +%m%d)
+ endif
+endif
+
+#
+# Copy galaxys specific prebuilt files
+#
+PRODUCT_COPY_FILES += \
+ vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/vendorsetup.sh b/vendorsetup.sh
index ceec54f..7dc8982 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -27,6 +27,7 @@
add_lunch_combo cyanogen_leo-eng
add_lunch_combo cyanogen_liberty-eng
add_lunch_combo cyanogen_mecha-eng
+add_lunch_combo cyanogen_mesmerizemtd-eng
add_lunch_combo cyanogen_morrison-eng
add_lunch_combo cyanogen_one-eng
add_lunch_combo cyanogen_p990-eng
@@ -34,6 +35,7 @@
add_lunch_combo cyanogen_passion-eng
add_lunch_combo cyanogen_shadow-eng
add_lunch_combo cyanogen_sholes-eng
+add_lunch_combo cyanogen_showcasemtd-eng
add_lunch_combo cyanogen_smb_a1002-eng
add_lunch_combo cyanogen_smb_a1004-eng
add_lunch_combo cyanogen_smb_a1011-eng