Merge branch 'froyo' of http://github.com/Kali-/android_vendor_cyanogen into froyo
diff --git a/CHANGELOG-6 b/CHANGELOG-6
deleted file mode 100644
index 9749e2b..0000000
--- a/CHANGELOG-6
+++ /dev/null
@@ -1,52 +0,0 @@
-CyanogenMod-6 CHANGELOG and Features..
-
-Visit http://github.com/CyanogenMod for full changelogs and git access.
-
-6.0.0-pre
----------
-* ANDROID: Google, HTC, Qualcomm, and everybody else. We <3 U
-* Common: Deskclock extra settings - cyanogen, mtwebster
-* Common: ADWLauncher 0.9 - Ander Webbs
-* Common: Music app enhancements - Eliot Stocker
-* Common: Phone mod V.30.1 - cytown
-* Common: WyContacts 1.2 - Wysie (port to Froyo by Sileht)
-* Common: Superuser 2.2.2 - Adam Shanks (ChainsDD)
-* Common: MMS enhancements from Ruqqq, Takuo Kitame, Jef Oliver
-* Common: Improved RTL text rendering - David Kohen, Omri Baumer
-* Common: Themable user interface elements - Wysie, bcrook, jeagoss
-* Common: FLAC playback support - Kenny Root, Cyanogen, Glenn Maynard
-* Common: Lockscreen enhancements - Wysie
-* Common: Long-press home options - Wysie, bcrook
-* Common: OpenVPN support - James Bottomley, Takuo Kitame
-* Common: Br0tips - Kmobs
-* Common: Browser incognito mode - Optedoblivion
-* Common: Zipalign on install (if needed) + system dex cache to /cache - Cyanogen/Chris Soyars
-* Common: Customizable Nexus LWP - Chris Soyars/Cyanogen
-* Common: JIT toggle, configurable heapsize, compcache supprt - Cyanogen
-* Common: Adjustable haptic feedback - Michael Webster
-* Common: Custom wallpapers - jairomeo, prash, SatanR1
-* Common: Battery percentage display - canadiancow, jeagoss
-* Common: Trackball wake, trackball unlock, menu unlock - Jon Boekenoogen/Kmobs
-* Common: Surfaceflinger night mode and effects - Jeff Sharkey
-* Common: Reflow webviews on pinch option - Jonas Larsson
-* Common: Enhanced accelerometer settings - Jonas Larsson
-* Common: A2DP bugfixes - Glenn Maynard
-* Common: Browser fullscreen mode and other enhancements - Wysie
-* Common: Translations: Takuo Kitame, Matthias Büchner, Eug89
-* Common: Major build system enhancements by Chris Soyars & Koush
-* Common: Long press volume buttons to skip songs - Jon Boekenoogen
-* Common: Accelerated ARMv7 JPEG decoding - Qualcomm
-* Common: Patch wrangling - Cyanogen, Chris Soyars, Koush
-* Common: Bluetooth HID support - Erin Yueh @ 0xlabs
-* Common: Mouse pointer support - Chih-Wei Huang (android-x86)
-* N1: Maintainer: Cyanogen
-* D/S: Maintainer: Cyanogen
-* D/S: Camera reverse engineering by NCommander & Cyanogen
-* D/S: Kernel patches for stability from Zinx Verituse
-* D/S: MT3G Fender/1.2 support from Zinx Verituse
-* Droid: Maintainer: Koush
-* Hero: Lox (GSM), Darchstar (CDMA)
-* Bravo (Desire): Maintainers: behnaam, Kali-
-* Incredible: Maintiner: Koush
-* Espresso (Slide): Maintainers: Wes Garner, Chris Soyars
-
diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 248ba9b..fb8e586 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -1,21 +1,57 @@
CyanogenMod
===============
+Visit http://github.com/CyanogenMod for full changelogs and git access.
+
CHANGELOG
---------
-### 6.0.0-alpha2
-* Common: Added battery percentage display.
-* Common: Added OpenVPN support.
-* Common: Updated Japanese translations.
-* Common: Added option for 270, 360 rotation.
-* Common: Added option to enable WebView reflow immediately after pinch to zoom.
-* Common: Added additional settings for Passion RIL to build.
-* Common: Added settings for configruable number of recent applications and custom home key binding.
-* Common: Added incognito browser window from optedoblivion.
-* Common: Upgraded to Superuser 2.2.
-* Common: 'System Updates' setting option hidden.
-* Common: Added invisible lock pattern option.
-* D/S: Opencore build tweaks to prevent the need for a separate D/S branch.
-* Heroes: Added light sensor support.
-* N1: Bumped to FRF91.
+### 6.0.0-pre
+* ANDROID: Google, HTC, Qualcomm, and everybody else. We <3 U
+* Common: Deskclock extra settings - cyanogen, mtwebster
+* Common: ADWLauncher 0.9 - Ander Webbs
+* Common: Music app enhancements - Eliot Stocker
+* Common: Phone mod V.30.1 - cytown
+* Common: WyContacts 1.2 - Wysie (port to Froyo by Sileht)
+* Common: Superuser 2.2.2 - Adam Shanks (ChainsDD)
+* Common: MMS enhancements from Ruqqq, Takuo Kitame, Jef Oliver
+* Common: Improved RTL text rendering - David Kohen, Omri Baumer
+* Common: Themable user interface elements - Wysie, bcrook, jeagoss
+* Common: FLAC playback support - Kenny Root, Cyanogen, Glenn Maynard
+* Common: Lockscreen enhancements - Wysie
+* Common: Long-press home options - Wysie, bcrook
+* Common: OpenVPN support - James Bottomley, Takuo Kitame
+* Common: Br0tips - Kmobs
+* Common: Browser incognito mode - Optedoblivion
+* Common: Zipalign on install (if needed) + system dex cache to /cache - Cyanogen/Chris Soyars
+* Common: Customizable Nexus LWP - Chris Soyars/Cyanogen
+* Common: JIT toggle, configurable heapsize, compcache supprt - Cyanogen
+* Common: Adjustable haptic feedback - Michael Webster
+* Common: Custom wallpapers - jairomeo, prash, SatanR1
+* Common: Battery percentage display - canadiancow, jeagoss
+* Common: Trackball wake, trackball unlock, menu unlock - Jon Boekenoogen/Kmobs
+* Common: Surfaceflinger night mode and effects - Jeff Sharkey
+* Common: Reflow webviews on pinch option - Jonas Larsson
+* Common: Enhanced accelerometer settings - Jonas Larsson
+* Common: A2DP bugfixes - Glenn Maynard
+* Common: Browser fullscreen mode and other enhancements - Wysie
+* Common: Translations: Takuo Kitame, Matthias Büchner, Eug89
+* Common: Major build system enhancements by Chris Soyars & Koush
+* Common: Long press volume buttons to skip songs - Jon Boekenoogen
+* Common: Accelerated ARMv7 JPEG decoding - Qualcomm
+* Common: Patch wrangling - Cyanogen, Chris Soyars, Koush
+* Common: Bluetooth HID support - Erin Yueh @ 0xlabs
+* Common: Mouse pointer support - Chih-Wei Huang (android-x86)
+* Common: Configurable install location + allow move any app to external storage - Cyanogen
+* N1/DS: Kernel 2.6.34 with Pershoot/Kmobs clock settings
+* N1: Maintainer: Cyanogen
+* D/S: Maintainer: Cyanogen
+* D/S: Camera reverse engineering by NCommander & Cyanogen
+* D/S: Kernel patches for stability from Zinx Verituse
+* D/S: MT3G Fender/1.2 support from Zinx Verituse
+* Droid: Maintainer: Koush
+* Hero: Lox (GSM), Darchstar (CDMA)
+* Bravo (Desire): Maintainers: behnaam, Kali-
+* Incredible: Maintiner: Koush
+* Espresso (Slide): Maintainers: Wes Garner, Chris Soyars
+
diff --git a/README.mkdn b/README.mkdn
index 15686c5..f776536 100644
--- a/README.mkdn
+++ b/README.mkdn
@@ -1,14 +1,37 @@
CyanogenMod
-===============
+===========
-CHANGELOG
----------
+Submitting Patches
+------------------
+Patches are always welcome! Please send pull requests with your patches! If at all possible please rebase your
+repository before sending a pull request. You can do this by using the following command:
-### 6.0.0-alpha2
-* Common: Added battery percentage display.
-* Common: Added OpenVPN support.
-* Common: Updated Japanese translations.
-* Common: Added option for 270, 360 rotation.
-* Common: Added option to enable WebView reflow immediately after pinch to zoom.
-* Common: Added additional settings for Passion RIL to build.
-* N1: Bumped to FRF91.
+ git pull --rebase git://github.com/CyanogenMod/path_to_project.git froyo
+
+This makes accepting patches MUCH easier for our comitters.
+
+Getting Started
+---------------
+
+To get started with Android/CyanogenMod, you'll need to get
+familiar with [Git and Repo](http://source.android.com/download/using-repo).
+
+To initialize your local repository using the CyanogenMod trees, use a command like this:
+
+ repo init -u git://github.com/CyanogenMod/android.git -b froyo
+
+Then to sync up:
+
+ repo sync
+
+Please see the [CyanogenMod Wiki](http://wiki.cyanogenmod.com/) for building instructions.
+
+For more information on this Github Organization and how it is structured,
+please [read the wiki article](http://wiki.cyanogenmod.com/index.php/Github_Organization)
+
+Buildbot
+--------
+
+All supported devices are built nightly and periodically as changes are committed to ensure the source trees remain buildable.
+
+You can view the current build statuses at [buildbot.teamdouche.net](http://buildbot.teamdouche.net/)
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/raw-de/main.dict b/overlay/common/packages/inputmethods/LatinIME/java/res/raw-de/main.dict
new file mode 100644
index 0000000..865c5f1
--- /dev/null
+++ b/overlay/common/packages/inputmethods/LatinIME/java/res/raw-de/main.dict
Binary files differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/raw-en/main.dict b/overlay/common/packages/inputmethods/LatinIME/java/res/raw-en/main.dict
new file mode 100644
index 0000000..472c23a
--- /dev/null
+++ b/overlay/common/packages/inputmethods/LatinIME/java/res/raw-en/main.dict
Binary files differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/raw-es/main.dict b/overlay/common/packages/inputmethods/LatinIME/java/res/raw-es/main.dict
new file mode 100644
index 0000000..cadb38c
--- /dev/null
+++ b/overlay/common/packages/inputmethods/LatinIME/java/res/raw-es/main.dict
Binary files differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/raw-fr/main.dict b/overlay/common/packages/inputmethods/LatinIME/java/res/raw-fr/main.dict
new file mode 100644
index 0000000..289539a
--- /dev/null
+++ b/overlay/common/packages/inputmethods/LatinIME/java/res/raw-fr/main.dict
Binary files differ
diff --git a/overlay/common/packages/inputmethods/LatinIME/java/res/raw-it/main.dict b/overlay/common/packages/inputmethods/LatinIME/java/res/raw-it/main.dict
new file mode 100644
index 0000000..563c00a
--- /dev/null
+++ b/overlay/common/packages/inputmethods/LatinIME/java/res/raw-it/main.dict
Binary files differ
diff --git a/overlay/dream_sapphire/packages/apps/Gallery3D/res/values/config.xml b/overlay/dream_sapphire/packages/apps/Gallery3D/res/values/config.xml
new file mode 100644
index 0000000..64f4ba3
--- /dev/null
+++ b/overlay/dream_sapphire/packages/apps/Gallery3D/res/values/config.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 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>
+
+ <bool name="reload_on_orientation_change">true</bool>
+
+</resources>
diff --git a/prebuilt/common/bin/backuptool.sh b/prebuilt/common/bin/backuptool.sh
index 65cf43a..e73f0ef 100755
--- a/prebuilt/common/bin/backuptool.sh
+++ b/prebuilt/common/bin/backuptool.sh
@@ -46,7 +46,6 @@
app/HtcEmailPolicy.apk
app/HtcSettings.apk
app/kickback.apk
-app/LatinImeGoogle.apk app/LatinIME.apk
app/LatinImeTutorial.apk
app/Maps.apk
app/MarketUpdater.apk
diff --git a/prebuilt/common/bin/sysinit b/prebuilt/common/bin/sysinit
new file mode 100755
index 0000000..b96fd4e
--- /dev/null
+++ b/prebuilt/common/bin/sysinit
@@ -0,0 +1,4 @@
+#!/system/bin/sh
+
+export PATH=/sbin:/system/sbin:/system/bin:/system/xbin
+/system/bin/logwrapper /system/xbin/run-parts /system/etc/init.d
diff --git a/products/common.mk b/products/common.mk
index 37eff7d..58ca530 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -65,6 +65,7 @@
vendor/cyanogen/prebuilt/common/etc/init.d/20userinit:system/etc/init.d/20userinit \
vendor/cyanogen/prebuilt/common/bin/compcache:system/bin/compcache \
vendor/cyanogen/prebuilt/common/bin/fix_permissions:system/bin/fix_permissions \
+ vendor/cyanogen/prebuilt/common/bin/sysinit:system/bin/sysinit \
vendor/cyanogen/prebuilt/common/xbin/htop:system/xbin/htop \
vendor/cyanogen/prebuilt/common/xbin/irssi:system/xbin/irssi \
vendor/cyanogen/prebuilt/common/xbin/lsof:system/xbin/lsof \
diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk
index 4468107..cc81e38 100644
--- a/products/cyanogen_dream_sapphire.mk
+++ b/products/cyanogen_dream_sapphire.mk
@@ -15,8 +15,8 @@
PRODUCT_DEVICE := dream_sapphire
PRODUCT_MODEL := Dream/Sapphire
PRODUCT_MANUFACTURER := HTC
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF83 BUILD_DISPLAY_ID=FRF83 PRODUCT_NAME=dream BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF83/42295:user/release-keys
-PRIVATE_BUILD_DESC="dream-user 2.2 FRF83 42295 release-keys"
+PRODUCT_BUILD_PROP_OVERRIDES += BUILD_ID=FRF91 BUILD_DISPLAY_ID=FRF91 BUILD_FINGERPRINT=google/passion/passion/mahimahi:2.2/FRF91/43546:user/release-keys
+PRIVATE_BUILD_DESC="sapphire-user 2.2 FRF91 43546 release-keys"
PRODUCT_SPECIFIC_DEFINES += TARGET_PRELINKER_MAP=$(TOP)/vendor/cyanogen/prelink-linux-arm-ds.map
@@ -25,6 +25,10 @@
PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_DIR=kernel-msm
PRODUCT_SPECIFIC_DEFINES += TARGET_KERNEL_CONFIG=cyanogen_msm_defconfig
+# Extra DS overlay
+PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/dream_sapphire
+
+# This file is used to install the correct audio profile when booted
PRODUCT_COPY_FILES += \
vendor/cyanogen/prebuilt/dream_sapphire/etc/init.d/02audio_profile:system/etc/init.d/02audio_profile
@@ -36,7 +40,7 @@
ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-DS
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-6.0.0-DS-test0
+ ro.modversion=CyanogenMod-6.0.0-DS-RC1
endif
# Use the audio profile hack
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index 2a7f540..e055151 100644
--- a/products/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -43,7 +43,7 @@
ro.modversion=CyanogenMod-6-$(shell date +%m%d%Y)-NIGHTLY-N1
else
PRODUCT_PROPERTY_OVERRIDES += \
- ro.modversion=CyanogenMod-6.0.0-N1-alpha2
+ ro.modversion=CyanogenMod-6.0.0-N1-RC1
endif
#