Merge "Updated click changes, and added Arco as Click mantainer" 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/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index f4b5a26..3be0dd9 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -134,8 +134,7 @@
<apn carrier="Vodafone IT MMS" mcc="222" mnc="10" apn="mms.vodafone.it" mmsc="http://mms.vodafone.it/servlets/mms" mmsproxy="10.128.224.10" mmsport="80" type="mms" />
<apn carrier="Vodafone IT" mcc="222" mnc="10" apn="mobile.vodafone.it" type="default,supl" />
<apn carrier="Vodafone WEB" mcc="222" mnc="10" apn="web.omnitel.it" type="default,supl" />
- <apn carrier="WIND Internet" mcc="222" mnc="88" apn="internet.wind" type="default,supl" />
- <apn carrier="Wind IT WEB" mcc="222" mnc="88" apn="internet.wind" type="default,supl,mms" />
+ <apn carrier="Wind IT WEB" mcc="222" mnc="88" apn="internet.wind" type="default,supl" />
<apn carrier="Wind IT MMS" mcc="222" mnc="88" apn="mms.wind" mmsc="http://mms.wind.it" mmsproxy="212.245.244.011" mmsport="8080" type="mms" />
<apn carrier="Fastweb" mcc="222" mnc="99" apn="apn.fastweb.it" mmsc="http://mms.fastweb.it/mms/wapenc" mmsproxy="10.0.65.9" mmsport="8080" type="default,supl,mms" />
<apn carrier="3 IT" mcc="222" mnc="99" apn="tre.it" mmsc="http://10.216.59.240:10021/mmsc" mmsproxy="wsb.treumts.it" mmsport="8799" type="default,supl,mms" />
@@ -537,6 +536,7 @@
<apn carrier="PLATWEB" mcc="310" mnc="100" apn="plateauweb" type="default,supl" />
<apn carrier="CDMA" mcc="310" mnc="120" apn="0" type="default,supl" />
<apn carrier="CDMA" mcc="310" mnc="120" apn="1" mmsc="http://mms.sprintpcs.com" type="default,supl" />
+ <apn carrier="USCC" mcc="310" mnc="120" apn="internet" mmsc="http://mmsc1.uscc.net/mmsc/MMS" authtype="3" port="80" mmsport="80" type="mms" />
<apn carrier="Virgin Mobile US" mcc="200" mnc="053" apn="0" port="" mmsproxy="205.239.233.136" mmsport="81" mmsc="http://mmsc.vmobl.com:8088/mms?" type="mms" />
<apn carrier="My Multi Media" mcc="310" mnc="130" apn="mms.c1.ama" user="cell1mms" password="cell1" mmsc="http://mms.iot1.com/amarillo/mms.php" type="mms" />
<apn carrier="T-Mobile US 160" mcc="310" mnc="160" apn="epc.tmobile.com" user="none" password="none" server="*" mmsc="http://mms.msg.eng.t-mobile.com/mms/wapenc" type="default,supl,mms" />
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index cd3d55b..a195c74 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 \
@@ -50,4 +52,5 @@
$(LOCAL_DIR)/cyanogen_z71.mk \
$(LOCAL_DIR)/cyanogen_zeppelin.mk \
$(LOCAL_DIR)/cyanogen_zero.mk \
- $(LOCAL_DIR)/cyanogen_zeus.mk
+ $(LOCAL_DIR)/cyanogen_zeus.mk \
+ $(LOCAL_DIR)/cyanogen_zeusc.mk
diff --git a/products/cyanogen_anzu.mk b/products/cyanogen_anzu.mk
index c94a4ae..47dae3d 100644
--- a/products/cyanogen_anzu.mk
+++ b/products/cyanogen_anzu.mk
@@ -37,14 +37,14 @@
#
ifdef CYANOGEN_NIGHTLY
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-XperiaArc
+ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-XperiaArc-LT15i
else
ifdef CYANOGEN_RELEASE
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.1.0-RC1-LT15i
+ ro.modversion=CyanogenMod-7.1.0-RC1-XperiaArc-LT15i
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.1.0-RC1-LT15i-KANG
+ ro.modversion=CyanogenMod-7.1.0-RC1-XperiaArc-LT15i-KANG
endif
endif
diff --git a/products/cyanogen_click.mk b/products/cyanogen_click.mk
index 9fec3c9..fc21698 100644
--- a/products/cyanogen_click.mk
+++ b/products/cyanogen_click.mk
@@ -19,7 +19,7 @@
PRODUCT_NAME := cyanogen_click
PRODUCT_BRAND := htc_wwe
PRODUCT_DEVICE := click
-PRODUCT_MODEL := HTC click
+PRODUCT_MODEL := HTC Tattoo
PRODUCT_MANUFACTURER := HTC
PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_click BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRJ90 BUILD_FINGERPRINT=google/passion/passion:2.3.3/GRI40/102588:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.3 GRI40 102588 release-keys"
diff --git a/products/cyanogen_hallon.mk b/products/cyanogen_hallon.mk
index 5fa98ad..8a67fbb 100644
--- a/products/cyanogen_hallon.mk
+++ b/products/cyanogen_hallon.mk
@@ -37,14 +37,14 @@
#
ifdef CYANOGEN_NIGHTLY
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-XperiaNeo
+ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-XperiaNeo-MT15i
else
ifdef CYANOGEN_RELEASE
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.1.0-RC1-MT15i
+ ro.modversion=CyanogenMod-7.1.0-RC1-XperiaNeo-MT15i
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.1.0-RC1-MT15i-KANG
+ ro.modversion=CyanogenMod-7.1.0-RC1-XperiaNeo-MT15i-KANG
endif
endif
diff --git a/products/cyanogen_mecha.mk b/products/cyanogen_mecha.mk
index 89ed764..b64f196 100644
--- a/products/cyanogen_mecha.mk
+++ b/products/cyanogen_mecha.mk
@@ -8,11 +8,11 @@
# Setup device specific product configuration.
#
PRODUCT_NAME := cyanogen_mecha
-PRODUCT_BRAND := htc_wwe
+PRODUCT_BRAND := verizon_wwe
PRODUCT_DEVICE := mecha
-PRODUCT_MODEL := ThunderBolt
+PRODUCT_MODEL := ADR6400L
PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_mecha BUILD_ID=FRG83D BUILD_DISPLAY_ID=GRJ90 BUILD_FINGERPRINT=verizon_wwe/htc_mecha/mecha/mecha:2.2.1/FRG83D/338893:user/release-keys PRIVATE_BUILD_DESC="1.12.605.6 CL338893 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_mecha BUILD_ID=FRG83D BUILD_DISPLAY_ID=GRJ90 BUILD_FINGERPRINT=verizon_wwe/htc_mecha/mecha/mecha:2.2.1/FRG83D/343953:user/release-keys PRIVATE_BUILD_DESC="1.70.605.0 CL343953 release-keys"
# Extra Mecha overlay
PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/mecha
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/products/cyanogen_zeus.mk b/products/cyanogen_zeus.mk
index ffcf158..4b95fd4 100644
--- a/products/cyanogen_zeus.mk
+++ b/products/cyanogen_zeus.mk
@@ -37,14 +37,14 @@
#
ifdef CYANOGEN_NIGHTLY
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-XperiaPlay
+ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-XperiaPlay-R800i
else
ifdef CYANOGEN_RELEASE
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.1.0-RC1-R800i
+ ro.modversion=CyanogenMod-7.1.0-RC1-XperiaPlay-R800i
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-7.1.0-RC1-R800i-KANG
+ ro.modversion=CyanogenMod-7.1.0-RC1-XperiaPlay-R800i-KANG
endif
endif
diff --git a/products/cyanogen_zeusc.mk b/products/cyanogen_zeusc.mk
new file mode 100644
index 0000000..76c89ce
--- /dev/null
+++ b/products/cyanogen_zeusc.mk
@@ -0,0 +1,53 @@
+# Inherit device configuration for zeus.
+$(call inherit-product, device/semc/zeus/device_zeus.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_zeusc
+PRODUCT_BRAND := SEMC
+PRODUCT_DEVICE := zeus
+PRODUCT_MODEL := R800x
+PRODUCT_MANUFACTURER := Sony Ericsson
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=Play BUILD_ID=3.0.1.A.0.145 BUILD_DISPLAY_ID=3.0.1.A.0.145 BUILD_FINGERPRINT=SEMC/R800i_1247-6199/R800i:2.3.3/3.0.1.A.0.145/bn_p:user/release-keys PRIVATE_BUILD_DESC="LT15i-user 2.3.3 3.0.1.A.0.145 bn_P test-keys"
+
+# Build kernel
+#PRODUCT_SPECIFIC_DEFINES += TARGET_PREBUILT_KERNEL=
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
+#PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_zeus_defconfig
+
+# Extra zeus overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/zeus
+
+# Add the Torch app
+#PRODUCT_PACKAGES += Torch
+
+
+# BCM FM radio
+#$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-XperiaPlay-R800x
+else
+ ifdef CYANOGEN_RELEASE
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=CyanogenMod-7.1.0-RC1-XperiaPlay-R800x
+ else
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=CyanogenMod-7.1.0-RC1-XperiaPlay-R800x-KANG
+ endif
+endif
+
+#
+# Copy passion 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..0bbc629 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
@@ -50,4 +52,5 @@
add_lunch_combo cyanogen_zeppelin-eng
add_lunch_combo cyanogen_zero-eng
add_lunch_combo cyanogen_zeus-eng
+add_lunch_combo cyanogen_zeusc-eng