Merge "Use pngcrush -brute by default." into gingerbread
diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index d31ff1d..ab76f1b 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -57,7 +57,7 @@
Translators:
------------
-* German: Matthias Büchner, Alexander Hofbauer, Sebastian K (DerSeppel), Ricco Thiel
+* German: Matthias Büchner, Alexander Hofbauer, Sebastian K (DerSeppel), Ricco Thiel, Andreas Böhm
* Italian: Eugenio Ziliotto, Giulio Cervera
* Japanese: Takuo Kitame
* French: Sébastien Vaucher, David Girault, Tanguy Pruvot
diff --git a/overlay/bcm_fm_radio/packages/apps/FM/res/values/config.xml b/overlay/bcm_fm_radio/packages/apps/FM/res/values/config.xml
new file mode 100644
index 0000000..bbb78f7
--- /dev/null
+++ b/overlay/bcm_fm_radio/packages/apps/FM/res/values/config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <!-- Whether or not seek is supported -->
+ <bool name="seek_supported">true</bool>
+</resources>
diff --git a/prebuilt/common/etc/init.d/06mountdl b/prebuilt/common/etc/init.d/06mountdl
index 81eec2a..14bc167 100755
--- a/prebuilt/common/etc/init.d/06mountdl
+++ b/prebuilt/common/etc/init.d/06mountdl
@@ -5,7 +5,15 @@
#
CACHESIZE=$(df -k /cache | tail -n1 | tr -s ' ' | cut -d ' ' -f2)
-if [ $CACHESIZE -lt 20000 ]
+DATAONLY=$(getprop dalvik.vm.dexopt-data-only)
+if [ $DATAONLY -eq 1 ]
+then
+ NEEDED=60000
+else
+ NEEDED=105000
+fi
+
+if [ $CACHESIZE -lt $NEEDED ]
then
mount -o bind /data/local/download /cache/download
fi
diff --git a/products/AndroidProducts.mk b/products/AndroidProducts.mk
index 6caf3d4..b65bbbe 100644
--- a/products/AndroidProducts.mk
+++ b/products/AndroidProducts.mk
@@ -8,6 +8,7 @@
$(LOCAL_DIR)/cyanogen_captivatemtd.mk \
$(LOCAL_DIR)/cyanogen_click.mk \
$(LOCAL_DIR)/cyanogen_coconut.mk \
+ $(LOCAL_DIR)/cyanogen_cooper.mk \
$(LOCAL_DIR)/cyanogen_crespo.mk \
$(LOCAL_DIR)/cyanogen_crespo4g.mk \
$(LOCAL_DIR)/cyanogen_desirec.mk \
@@ -40,6 +41,7 @@
$(LOCAL_DIR)/cyanogen_motus.mk \
$(LOCAL_DIR)/cyanogen_one.mk \
$(LOCAL_DIR)/cyanogen_olympus.mk \
+ $(LOCAL_DIR)/cyanogen_p970.mk \
$(LOCAL_DIR)/cyanogen_p990.mk \
$(LOCAL_DIR)/cyanogen_p999.mk \
$(LOCAL_DIR)/cyanogen_passion.mk \
diff --git a/products/bcm_fm_radio.mk b/products/bcm_fm_radio.mk
index 8566a0c..1e559e7 100644
--- a/products/bcm_fm_radio.mk
+++ b/products/bcm_fm_radio.mk
@@ -2,3 +2,5 @@
PRODUCT_PACKAGES += \
FM \
hcitool
+
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/bcm_fm_radio
diff --git a/products/common_full_no_themes.mk b/products/common_full_no_themes.mk
new file mode 100644
index 0000000..c45a069
--- /dev/null
+++ b/products/common_full_no_themes.mk
@@ -0,0 +1,18 @@
+# Inherit common CM stuff
+$(call inherit-product, vendor/cyanogen/products/common.mk)
+
+# CyanogenMod specific product packages
+PRODUCT_PACKAGES += \
+ CMWallpapers
+
+# Bring in all audio files
+include frameworks/base/data/sounds/AllAudio.mk
+
+# Include extra dictionaries for LatinIME
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/dictionaries
+
+# Default ringtone
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.config.ringtone=Playa.ogg \
+ ro.config.notification_sound=regulus.ogg \
+ ro.config.alarm_alert=Alarm_Beep_03.ogg
diff --git a/products/cyanogen_buzz.mk b/products/cyanogen_buzz.mk
index 1ea231a..876e6c2 100644
--- a/products/cyanogen_buzz.mk
+++ b/products/cyanogen_buzz.mk
@@ -2,7 +2,7 @@
$(call inherit-product, device/htc/buzz/buzz.mk)
# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full_no_themes.mk)
# Include GSM stuff
$(call inherit-product, vendor/cyanogen/products/gsm.mk)
@@ -17,6 +17,8 @@
PRODUCT_MANUFACTURER := HTC
PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=htc_buzz BUILD_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_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-msm722x.map
+
# Add LDPI assets, in addition to MDPI
PRODUCT_LOCALES += ldpi mdpi
diff --git a/products/cyanogen_click.mk b/products/cyanogen_click.mk
index c577386..bdcde71 100644
--- a/products/cyanogen_click.mk
+++ b/products/cyanogen_click.mk
@@ -2,7 +2,7 @@
$(call inherit-product, device/htc/click/click.mk)
# Inherit some common cyanogenmod stuff.
-$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+$(call inherit-product, vendor/cyanogen/products/common_full_no_themes.mk)
# Include GSM stuff
$(call inherit-product, vendor/cyanogen/products/gsm.mk)
diff --git a/products/cyanogen_cooper.mk b/products/cyanogen_cooper.mk
new file mode 100644
index 0000000..1537d0b
--- /dev/null
+++ b/products/cyanogen_cooper.mk
@@ -0,0 +1,29 @@
+# Inherit AOSP device configuration for blade.
+$(call inherit-product, device/samsung/cooper/device_cooper.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+# Include GSM stuff
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_cooper
+PRODUCT_BRAND := samsung
+PRODUCT_DEVICE := cooper
+PRODUCT_MODEL := GT-S5830
+PRODUCT_MANUFACTURER := Samsung
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=cooper BUILD_ID=GRWK74 BUILD_FINGERPRINT=samsung/GT-S5830/GT-S5830:2.3.4/GINGERBREAD/XXKPH:user/test-keys PRIVATE_BUILD_DESC="GT-S5830-user 2.3.4 GINGERBREAD XXKPH test-keys"
+
+# Release name and versioning
+PRODUCT_RELEASE_NAME := GalaxyAce
+PRODUCT_VERSION_DEVICE_SPECIFIC :=
+-include vendor/cyanogen/products/common_versions.mk
+
+#
+# Copy legend specific prebuilt files
+#
+PRODUCT_COPY_FILES += \
+ vendor/cyanogen/prebuilt/mdpi/media/bootanimation.zip:system/media/bootanimation.zip
diff --git a/products/cyanogen_jordan.mk b/products/cyanogen_jordan.mk
index b0efc15..4105463 100644
--- a/products/cyanogen_jordan.mk
+++ b/products/cyanogen_jordan.mk
@@ -20,8 +20,7 @@
PRODUCT_BRAND := MOTO
PRODUCT_DEVICE := jordan
PRODUCT_MODEL := MB525
-PRODUCT_MANUFACTURER := motorola
-PRODUCT_SBF := 3.4.2-179-4
+PRODUCT_MANUFACTURER := Motorola
PRODUCT_SFX := JOREM_U3
# Release name and versioning
@@ -36,8 +35,8 @@
BUILD_ID=GWK74 \
PRODUCT_NAME=${PRODUCT_MODEL}_${PRODUCT_SFX} \
TARGET_DEVICE=umts_jordan \
- BUILD_FINGERPRINT=MOTO/${PRODUCT_MODEL}_${PRODUCT_SFX}/umts_jordan/jordan:2.3.7/${PRODUCT_SBF}/${UTC_DATE}:user/release-keys \
- PRIVATE_BUILD_DESC="umts_jordan-user 2.3.7 ${PRODUCT_SFX}_${PRODUCT_SBF} ${UTC_DATE} release-keys" \
+ BUILD_FINGERPRINT=MOTO/MB526_RTDACH/umts_jordan:2.3.4/4.5.1-134_DFP-74/1313117579:user/release-keys \
+ PRIVATE_BUILD_DESC="umts_jordan_emara-user 2.3.4 4.5.1-134_DFP-74 1313117579 release-keys" \
BUILD_NUMBER=${DATE} \
BUILD_VERSION_TAGS=release-keys \
TARGET_BUILD_TYPE=user
diff --git a/products/cyanogen_p970.mk b/products/cyanogen_p970.mk
new file mode 100644
index 0000000..1e0864b
--- /dev/null
+++ b/products/cyanogen_p970.mk
@@ -0,0 +1,35 @@
+# Include GSM stuff
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
+# Inherit device configuration
+$(call inherit-product, device/lge/p970/p970.mk)
+
+# Inherit some common cyanogenmod stuff.
+$(call inherit-product, vendor/cyanogen/products/common_full.mk)
+
+#
+# Setup device specific product configuration.
+#
+PRODUCT_NAME := cyanogen_p970
+PRODUCT_BRAND := lge
+PRODUCT_DEVICE := p970
+PRODUCT_MODEL := LG-P970
+PRODUCT_MANUFACTURER := LGE
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=lge_bproj BUILD_ID=GRJ22 BUILD_FINGERPRINT="lge/lge_bproj/bproj_EUR-XXX:2.3.4/GRJ22/LG-P970-V20d.421CC761:user/release-keys" PRIVATE_BUILD_DESC="lge_bproj-user 2.3.4 GRJ22 LG-P970-V20d.421CC761 release-keys"
+
+# Broadcom FM radio
+$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
+
+# Release name and versioning
+PRODUCT_RELEASE_NAME := OptimusBlack
+PRODUCT_VERSION_DEVICE_SPECIFIC :=
+-include vendor/cyanogen/products/common_versions.mk
+
+#
+# Copy prebuilt files
+#
+PRODUCT_COPY_FILES += \
+ vendor/cyanogen/prebuilt/hdpi/media/bootanimation.zip:system/media/bootanimation.zip
+
+# Add the Torch app
+PRODUCT_PACKAGES += Torch
diff --git a/products/cyanogen_p990.mk b/products/cyanogen_p990.mk
index e4d32c1..f3a871c 100644
--- a/products/cyanogen_p990.mk
+++ b/products/cyanogen_p990.mk
@@ -15,11 +15,14 @@
PRODUCT_DEVICE := p990
PRODUCT_MODEL := Optimus 2X
PRODUCT_MANUFACTURER := LGE
-PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=lge_star BUILD_ID=FRG83G BUILD_FINGERPRINT=lge/lge_star/p990/p990:2.2.2/FRG83G/lgp990-V10b.2ED2ADCFFC:user/release-keys PRIVATE_BUILD_DESC="star-user 2.2.2 FRG83G 2ED2ADCFFC release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += PRODUCT_NAME=lge_star BUILD_ID=GRJ22 BUILD_FINGERPRINT=lge/lge_star/p990_EUR-xx:2.3.4/GRJ22/lgp990-V20l.422C563E:user/release-keys PRIVATE_BUILD_DESC="lge_star-user 2.3.4 GRJ22 422C563E release-keys"
# Extra Star overlay
PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/star
+# Broadcom FM radio
+$(call inherit-product, vendor/cyanogen/products/bcm_fm_radio.mk)
+
# Release name and versioning
PRODUCT_RELEASE_NAME := Optimus2X
PRODUCT_VERSION_DEVICE_SPECIFIC :=
diff --git a/products/cyanogen_satsuma.mk b/products/cyanogen_satsuma.mk
index 9997d59..9e3394c 100644
--- a/products/cyanogen_satsuma.mk
+++ b/products/cyanogen_satsuma.mk
@@ -26,7 +26,7 @@
PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/satsuma
# Add the Torch app
-#PRODUCT_PACKAGES += Torch
+PRODUCT_PACKAGES += Torch
# BCM FM radio
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 6a304fa..7b16f69 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -7,6 +7,7 @@
add_lunch_combo cyanogen_click-eng
add_lunch_combo cyanogen_captivatemtd-eng
add_lunch_combo cyanogen_coconut-eng
+add_lunch_combo cyanogen_cooper-eng
add_lunch_combo cyanogen_crespo-eng
add_lunch_combo cyanogen_crespo4g-eng
add_lunch_combo cyanogen_desirec-eng
@@ -39,6 +40,7 @@
add_lunch_combo cyanogen_motus-eng
add_lunch_combo cyanogen_one-eng
add_lunch_combo cyanogen_olympus-eng
+add_lunch_combo cyanogen_p970-eng
add_lunch_combo cyanogen_p990-eng
add_lunch_combo cyanogen_p999-eng
add_lunch_combo cyanogen_passion-eng