Merge "cm: bump version" into mr1-staging
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_cs.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_cs.dict
index a6046a4..14ab6b2 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_cs.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_cs.dict
Binary files differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_da.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_da.dict
index 64fe8cf..3d62f9b 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_da.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_da.dict
Binary files differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_el.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_el.dict
index ccc9cb2..1f7a812 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_el.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_el.dict
Binary files differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_en.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_en.dict
index 9f08316..2d70d3a 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_en.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_en.dict
Binary files differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_fi.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_fi.dict
index 563fd20..4dfc819 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_fi.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_fi.dict
Binary files differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_hr.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_hr.dict
index 60056b1..9518151 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_hr.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_hr.dict
Binary files differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_nb.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_nb.dict
index d4a6729..30574f9 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_nb.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_nb.dict
Binary files differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_nl.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_nl.dict
index dc6069f..e694c21 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_nl.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_nl.dict
Binary files differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_pt_pt.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_pt_pt.dict
index 760e6d4..71ab6af 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_pt_pt.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_pt_pt.dict
Binary files differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_ru.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_ru.dict
index 6f77f97..050b0b8 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_ru.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_ru.dict
Binary files differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_sv.dict b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_sv.dict
index 46eb1c6..3282e4c 100644
--- a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_sv.dict
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/raw/main_sv.dict
Binary files differ
diff --git a/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/values/gesture-input.xml b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/values/gesture-input.xml
new file mode 100644
index 0000000..445a389
--- /dev/null
+++ b/overlay/dictionaries/packages/inputmethods/LatinIME/java/res/values/gesture-input.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, 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="config_gesture_input_enabled_by_build_config">true</bool>
+</resources>
diff --git a/prebuilt/common/etc/init.d/00banner b/prebuilt/common/etc/init.d/00banner
index ed2f4b7..a04ef18 100644
--- a/prebuilt/common/etc/init.d/00banner
+++ b/prebuilt/common/etc/init.d/00banner
@@ -4,9 +4,7 @@
#
L="log -p i -t cm"
+$L "____ _ _ ____ _ _ ____ ____ ____ _ _ _ _ ____ ___";
+$L "| \\_/ |__| |\\ | | | | __ |___ |\\ | |\\/| | | | \\";
+$L "|___ | | | | \\| |__| |__] |___ | \\| | | |__| |__/";
$L "Welcome to Android `getprop ro.build.version.release` / CyanogenMod-`getprop ro.cm.version`";
-$L " _ ";
-$L " __ __ _ ___ _ _ __ ___ __ _ _ _ _ __ __))";
-$L "((_ \\(/'((_( ((\\( ((_)((_( (('((\\( ((\`1( ((_)((_( ";
-$L " )) _))";
-$L " ";
diff --git a/prebuilt/common/etc/init.local.rc b/prebuilt/common/etc/init.local.rc
index 2a31cc3..e5f5549 100644
--- a/prebuilt/common/etc/init.local.rc
+++ b/prebuilt/common/etc/init.local.rc
@@ -11,6 +11,9 @@
chmod 0771 /cache/dalvik-cache
on boot
+ # Run sysinit
+ start sysinit
+
chown system system /sys/block/mmcblk0/queue/scheduler
chmod 0664 /sys/block/mmcblk0/queue/scheduler
@@ -38,3 +41,8 @@
user root
group root
oneshot
+
+# sysinit (/system/etc/init.d)
+service sysinit /system/bin/sysinit
+ user root
+ oneshot