Merge "parallelize the launching of $OPTICHARGER form squiasher script" into froyo
diff --git a/overlay/vision/frameworks/base/core/res/res/values/config.xml b/overlay/vision/frameworks/base/core/res/res/values/config.xml
new file mode 100644
index 0000000..d3b987e
--- /dev/null
+++ b/overlay/vision/frameworks/base/core/res/res/values/config.xml
@@ -0,0 +1,28 @@
+<?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>
+
+    <!-- Control whether status bar should distinguish HSPA data icon form UMTS data icon on devices -->
+    <bool name="config_hspa_data_distinguishable">true</bool>
+
+    <!-- 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/vision/packages/apps/CMParts/res/values/config.xml b/overlay/vision/packages/apps/CMParts/res/values/config.xml
new file mode 100644
index 0000000..43287b4
--- /dev/null
+++ b/overlay/vision/packages/apps/CMParts/res/values/config.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Whether or not to display the trackball settings -->
+    <bool name="has_trackball">true</bool>
+    <bool name="has_rgb_notification_led">false</bool>
+</resources>
diff --git a/prebuilt/common/bin/verify_cache_partition_size.sh b/prebuilt/common/bin/verify_cache_partition_size.sh
new file mode 100644
index 0000000..748f6b2
--- /dev/null
+++ b/prebuilt/common/bin/verify_cache_partition_size.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# Force /system dalvik-cache on /data instead of /cache if is not large enough
+#
+
+CACHESIZE=$(df -k /cache | tail -n1 | tr -s ' ' | cut -d ' ' -f2)
+if [ $CACHESIZE \< 60000 ]
+then
+  echo "dalvik.vm.dexopt-data-only=1" >> /system/build.prop > /dev/null 2>&1
+fi
diff --git a/products/common.mk b/products/common.mk
index 69fbd12..efc1cda 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -59,6 +59,7 @@
 
 PRODUCT_COPY_FILES += \
     vendor/cyanogen/prebuilt/common/bin/backuptool.sh:system/bin/backuptool.sh \
+    vendor/cyanogen/prebuilt/common/bin/verify_cache_partition_size.sh:system/bin/verify_cache_partition_size.sh \
     vendor/cyanogen/prebuilt/common/etc/resolv.conf:system/etc/resolv.conf \
     vendor/cyanogen/prebuilt/common/etc/sysctl.conf:system/etc/sysctl.conf \
     vendor/cyanogen/prebuilt/common/etc/terminfo/l/linux:system/etc/terminfo/l/linux \
diff --git a/products/cyanogen_vision.mk b/products/cyanogen_vision.mk
index db1d315..e994e71 100644
--- a/products/cyanogen_vision.mk
+++ b/products/cyanogen_vision.mk
@@ -25,7 +25,7 @@
 # Include the Torch app
 PRODUCT_PACKAGES += Torch
 
-# Extra Passion overlay
+# Extra Vision overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/vision
 
 #