Merge "Add has_search_button flag" into gingerbread
diff --git a/get-google-files b/get-google-files
index e5e6817..009e169 100755
--- a/get-google-files
+++ b/get-google-files
@@ -2,7 +2,7 @@
import sys, random, urllib2, zipfile, StringIO, os
from optparse import OptionParser
-FILENAME=["gapps-gb-20110307-signed.zip","gapps-hdpi-20101114-signed.zip","gapps-mdpi-20110501-signed.zip","gapps-mdpi-tiny-20101020-signed.zip","gapps-mdpi-tegra-20101020-signed.zip","gapps-passion-EPE54B-signed.zip","gapps-ds-ERE36B-signed.zip","DRC83_base_defanged.zip"]
+FILENAME=["gapps-gb-20110613-signed.zip","gapps-hdpi-20101114-signed.zip","gapps-mdpi-20110501-signed.zip","gapps-mdpi-tiny-20101020-signed.zip","gapps-mdpi-tegra-20101020-signed.zip","gapps-passion-EPE54B-signed.zip","gapps-ds-ERE36B-signed.zip","DRC83_base_defanged.zip"]
VERSIONS=["gb","hdpi","mdpi","mdpi-tiny","tegra","cm5hdpi","cm5mdpi","cm4"]
MIRRORS=["http://goo-inside.me/gapps/","http://android.d3xt3r01.tk/cyanogen/gapps/"]
diff --git a/overlay/ldpi/frameworks/base/packages/SystemUI/res/layout/status_bar_expanded.xml b/overlay/ldpi/frameworks/base/packages/SystemUI/res/layout/status_bar_expanded.xml
index ac742a1..71adf8e 100644
--- a/overlay/ldpi/frameworks/base/packages/SystemUI/res/layout/status_bar_expanded.xml
+++ b/overlay/ldpi/frameworks/base/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -143,6 +143,21 @@
/>
</com.android.systemui.statusbar.NotificationLinearLayout>
</ScrollView>
+ <ScrollView
+ android:id="@+id/bottomScroll"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fadingEdge="none"
+ android:overScrollMode="ifContentScrolls"
+ >
+ <com.android.systemui.statusbar.NotificationLinearLayout
+ android:id="@+id/bottomNotificationLinearLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:layout_gravity="bottom"
+ />
+ </ScrollView>
<LinearLayout android:id="@+id/compact_carrier_layout"
android:orientation="horizontal"
diff --git a/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml b/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml
index 646fa79..cfa3233 100644
--- a/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml
+++ b/overlay/ldpi/packages/apps/FM/res/layout/fmradio.xml
@@ -63,13 +63,20 @@
android:layout_height="48dip"
android:orientation="horizontal"
android:layout_marginTop="4dip"
- android:paddingLeft="14dip"
- android:paddingRight="13dip"
+ android:paddingLeft="0dip"
+ android:paddingRight="0dip"
>
+ <ImageButton android:id="@+id/btn_seekdown"
+ android:src="@drawable/btn_arrow_left"
+ android:background="@null"
+ android:layout_marginLeft="1dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ />
<ImageButton android:id="@+id/btn_speaker"
android:src="@drawable/button_loudspeaker_off"
android:background="@null"
- android:layout_marginLeft="5dip"
+ android:layout_marginLeft="0dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
@@ -78,7 +85,7 @@
android:background="@drawable/station_freq_bg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="28dip"
+ android:layout_marginLeft="1dip"
>
<TextView android:id="@+id/prog_frequency_tv"
android:layout_width="match_parent"
@@ -94,7 +101,15 @@
<ImageButton android:id="@+id/btn_onoff"
android:src="@drawable/button_power_off"
android:background="@null"
- android:layout_marginLeft="28dip"
+ android:layout_marginLeft="1dip"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ />
+
+ <ImageButton android:id="@+id/btn_seekup"
+ android:src="@drawable/btn_arrow_right"
+ android:background="@null"
+ android:layout_marginLeft="0dip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
/>
diff --git a/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/app_gauge.9.png b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/app_gauge.9.png
new file mode 100644
index 0000000..f6c7c99
--- /dev/null
+++ b/overlay/ldpi/packages/apps/Settings/res/drawable-ldpi/app_gauge.9.png
Binary files differ
diff --git a/overlay/shadow/packages/apps/CMParts/res/values/config.xml b/overlay/shadow/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 0000000..b9582a8
--- /dev/null
+++ b/overlay/shadow/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">true</bool>
+ <bool name="has_led_flash">true</bool>
+</resources>
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index 39666ce..85f800e 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -140,9 +140,15 @@
fi
}
+# don't (u)mount system if already done
+UMOUNT=0
+
case "$1" in
backup)
- mount $S
+ if [ ! -f "$S/build.prop" ]; then
+ mount $S
+ UMOUNT=1
+ fi
check_prereq;
check_installscript;
if [ $PROCEED -ne 0 ];
@@ -155,9 +161,15 @@
done
done
fi
- umount $S
+ if [ $UMOUNT -ne 0 ]; then
+ umount $S
+ fi
;;
restore)
+ if [ ! -f "$S/build.prop" ]; then
+ mount $S
+ UMOUNT=1
+ fi
check_prereq;
check_installscript;
if [ $PROCEED -ne 0 ];
@@ -171,6 +183,10 @@
done
rm -rf $C
fi
+ if [ $UMOUNT -ne 0 ]; then
+ umount $S
+ fi
+ sync
;;
*)
echo "Usage: $0 {backup|restore}"
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index a8f6cac..510b6aa 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -360,13 +360,14 @@
<apn carrier="МТС Центр MMS" mcc="250" mnc="93" apn="mms.mts.ru" user="mts" password="mts" mmsc="http://mmsc" mmsproxy="192.168.192.192" mmsport="8080" type="mms" />
<apn carrier="BeeLine RU" mcc="250" mnc="99" apn="internet.beeline.ru" user="beeline" password="beeline" type="default,supl" />
<apn carrier="BeeLine RU MMS" mcc="250" mnc="99" apn="mms.beeline.ru" user="beeline" password="beeline" mmsc="http://mms/" mmsproxy="192.168.094.023" mmsport="8080" type="mms" />
+ <apn carrier="MTS UA" mcc="255" mnc="01" apn="internet" type="default,supl" />
+ <apn carrier="MTS UA" mcc="255" mnc="01" apn="www.mts.com.ua" type="default,supl" />
<apn carrier="MTS UA" mcc="255" mnc="01" apn="active" type="default,supl" />
<apn carrier="MTS UA" mcc="255" mnc="01" apn="hyper.net" type="default,supl" />
<apn carrier="JEANS MMS" mcc="255" mnc="01" apn="mms.jeans.ua" mmsc="http://mmsc:8002" mmsproxy="192.168.10.10" mmsport="8080" type="mms" />
<apn carrier="MTS UA" mcc="255" mnc="01" apn="mms.umc.ua" mmsc="http://mmsc:8002/" mmsproxy="192.168.010.010" mmsport="8080" type="mms" />
<apn carrier="MTS-MMS" mcc="255" mnc="01" apn="mms" mmsc="http://mmsc:8002" mmsproxy="192.168.010.010" mmsport="8080" type="mms" />
<apn carrier="JEANS" mcc="255" mnc="01" apn="www.jeans.ua" type="default,supl" />
- <apn carrier="MTS UA" mcc="255" mnc="01" apn="www.mts.com.ua" type="default,supl" />
<apn carrier="MTS UA" mcc="255" mnc="01" apn="www.umc.ua" type="default,supl" />
<apn carrier="Beeline UA" mcc="255" mnc="02" apn="internet.beeeline.ua" type="default,supl" />
<apn carrier="Beeline-internet" mcc="255" mnc="02" apn="internet.beeline.ua" type="default,supl" />
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index d183761..c209f80 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -27,6 +27,7 @@
$(LOCAL_DIR)/cyanogen_p990.mk \
$(LOCAL_DIR)/cyanogen_p999.mk \
$(LOCAL_DIR)/cyanogen_passion.mk \
+ $(LOCAL_DIR)/cyanogen_shadow.mk \
$(LOCAL_DIR)/cyanogen_sholes.mk \
$(LOCAL_DIR)/cyanogen_smb_a1002.mk \
$(LOCAL_DIR)/cyanogen_smb_a1004.mk \
diff --git a/products/cyanogen_blade.mk b/products/cyanogen_blade.mk
index 634fcbf..74577a3 100644
--- a/products/cyanogen_blade.mk
+++ b/products/cyanogen_blade.mk
@@ -15,7 +15,7 @@
PRODUCT_DEVICE := blade
PRODUCT_MODEL := Blade
PRODUCT_MANUFACTURER := ZTE
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=cyanogen_blade BUILD_ID=FRG83 BUILD_DISPLAY_ID=GRJ22 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"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=blade BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
#
# Set ro.modversion
diff --git a/products/cyanogen_morrison.mk b/products/cyanogen_morrison.mk
index 8829e1a..837a4a4 100644
--- a/products/cyanogen_morrison.mk
+++ b/products/cyanogen_morrison.mk
@@ -14,7 +14,7 @@
PRODUCT_NAME := cyanogen_morrison
PRODUCT_BRAND := motorola
PRODUCT_DEVICE := morrison
-PRODUCT_MODEL := CLIQ
+PRODUCT_MODEL := MB200
PRODUCT_MANUFACTURER := Motorola
#
diff --git a/products/cyanogen_shadow.mk b/products/cyanogen_shadow.mk
new file mode 100644
index 0000000..23c9246
--- /dev/null
+++ b/products/cyanogen_shadow.mk
@@ -0,0 +1,40 @@
+# Inherit AOSP device configuration for passion.
+$(call inherit-product, device/motorola/shadow/shadow.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_shadow
+PRODUCT_BRAND := motorola
+PRODUCT_DEVICE := shadow
+PRODUCT_MODEL := DROIDX
+PRODUCT_MANUFACTURER := Motorola
+
+#
+# Set ro.modversion
+#
+ifdef CYANOGEN_NIGHTLY
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=CyanogenMod-7-$(shell date +%m%d%Y)-NIGHTLY-DROIDX
+else
+ ifdef CYANOGEN_RELEASE
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=CyanogenMod-7.1.0-RC0-DROIDX
+ else
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.modversion=CyanogenMod-7.1.0-RC0-DROIDX-KANG
+ endif
+endif
+
+PRODUCT_BUILD_PROP_OVERRIDES := BUILD_ID=VZW BUILD_DISPLAY_ID=GRH78C PRODUCT_NAME=shadow_vzw TARGET_DEVICE=cdma_shadow BUILD_FINGERPRINT=verizon/shadow_vzw/cdma_shadow/shadow:2.2.1/VZW/23.340:user/ota-rel-keys,release-keys PRODUCT_BRAND=verizon PRIVATE_BUILD_DESC="cdma_shadow-user 2.2.1 VZW 2.3.340 ota-rel-keys,release-keys" BUILD_NUMBER=2.3.340 BUILD_UTC_DATE=1289194863 TARGET_BUILD_TYPE=user BUILD_VERSION_TAGS=release-keys USER=w30471
+
+PRODUCT_COPY_FILES += \
+ vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
+
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/shadow
+
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
diff --git a/products/cyanogen_u8220.mk b/products/cyanogen_u8220.mk
index 8a86b5a..ed7591b 100644
--- a/products/cyanogen_u8220.mk
+++ b/products/cyanogen_u8220.mk
@@ -15,7 +15,7 @@
PRODUCT_DEVICE := u8220
PRODUCT_MODEL := U8220/U8230
PRODUCT_MANUFACTURER := Huawei
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=GRI40 BUILD_DISPLAY_ID=GRI40 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"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=u8220 BUILD_ID=GRJ22 BUILD_DISPLAY_ID=GRJ22 BUILD_FINGERPRINT=google/passion/passion:2.3.4/GRJ22/121341:user/release-keys PRIVATE_BUILD_DESC="passion-user 2.3.4 GRJ22 121341 release-keys"
#
# Set ro.modversion
diff --git a/products/cyanogen_zeppelin.mk b/products/cyanogen_zeppelin.mk
index 7229435..c30f24d 100644
--- a/products/cyanogen_zeppelin.mk
+++ b/products/cyanogen_zeppelin.mk
@@ -14,7 +14,7 @@
PRODUCT_NAME := cyanogen_zeppelin
PRODUCT_BRAND := motorola
PRODUCT_DEVICE := zeppelin
-PRODUCT_MODEL := CLIQ XT
+PRODUCT_MODEL := MB501
PRODUCT_MANUFACTURER := Motorola
#
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 84073b6..ba9e7fe 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -26,6 +26,7 @@
add_lunch_combo cyanogen_p990-eng
add_lunch_combo cyanogen_p999-eng
add_lunch_combo cyanogen_passion-eng
+add_lunch_combo cyanogen_shadow-eng
add_lunch_combo cyanogen_sholes-eng
add_lunch_combo cyanogen_smb_a1002-eng
add_lunch_combo cyanogen_smb_a1004-eng
