From b521a675304dc2af41876261eaa0c576006e8cec Mon Sep 17 00:00:00 2001
From: Arif Ali <mail@arif-ali.co.uk>
Date: Mon, 12 Dec 2011 01:57:29 +0000
Subject: [PATCH] leo: a few fixes from bravo (credits drewis)

---
 leo.mk                                        | 14 +++++--
 .../base/core/res/res/values/config.xml       |  4 +-
 .../base/core/res/res/xml/storage_list.xml    | 41 +++++++++++++++++++
 prebuilt/init.htcleo.rc                       |  9 ++--
 4 files changed, 57 insertions(+), 11 deletions(-)
 create mode 100644 overlay/frameworks/base/core/res/res/xml/storage_list.xml

diff --git a/leo.mk b/leo.mk
index af9eb00..75a0592 100755
--- a/leo.mk
+++ b/leo.mk
@@ -46,7 +46,10 @@ PRODUCT_COPY_FILES += \
     frameworks/base/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml \
     frameworks/base/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
     frameworks/base/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml \
-    frameworks/base/data/etc/android.hardware.touchscreen.multitouch.distinct.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.distinct.xml
+    frameworks/base/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:system/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml \
+    frameworks/base/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml \
+    frameworks/base/data/etc/android.hardware.sensor.accelerometer.xml:system/etc/permissions/android.hardware.sensor.accelerometer.xml \
+    frameworks/base/data/etc/android.hardware.sensor.compass.xml:system/etc/permissions/android.hardware.sensor.compass.xml
 
 # media config xml file
 PRODUCT_COPY_FILES += \
@@ -63,10 +66,13 @@ PRODUCT_PACKAGES += \
     leo-reference-ril \
     gps.htcleo \
     libgps \
+    com.android.future.usb.accessory \
     libhtc_ril_wrapper \
-    audio.primary.qsd8k \
-    audio_policy.qsd8k \
-    copybit.qsd8k
+    audio.a2dp.default \
+    audio.primary.htcleo \
+    audio_policy.htcleo \
+    copybit.htcleo \
+    gralloc.htcleo
 
 # leo uses high-density artwork where available 
 PRODUCT_LOCALES := hdpi
diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
index eb3545e..21cacce 100644
--- a/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/frameworks/base/core/res/res/values/config.xml
@@ -100,7 +100,7 @@
     <!-- Array of output values for keyboard backlight corresponding to the LUX values
          in the config_autoBrightnessLevels array.  This array should have size one greater
          than the size of the config_autoBrightnessLevels array.
-         Passion has no keyboard so all values are zero.
+         Leo has no keyboard so all values are zero.
     -->
     <integer-array name="config_autoBrightnessKeyboardBacklightValues">
         <item>0</item>
@@ -112,7 +112,7 @@
     
     <!-- Component name of the default wallpaper. This will be ImageWallpaper if not 
          specified -->
-    <string name="default_wallpaper_component">com.android.wallpaper.nexus.NexusWallpaper</string>
+    <string name="default_wallpaper_component">com.android.wallpaper/.nexus.NexusWallpaper</string>
 
     <integer name="config_deskDockKeepsScreenOn">0</integer>
     <integer name="config_carDockKeepsScreenOn">1</integer>
diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
new file mode 100644
index 0000000..e1c713a
--- /dev/null
+++ b/overlay/frameworks/base/core/res/res/xml/storage_list.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2011, 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.
+*/
+-->
+
+<!-- The <device> element should contain one or more <storage> elements.
+     Exactly one of these should have the attribute primary="true".
+     This storage will be the primary external storage and should have mountPoint="/mnt/sdcard".
+     Each storage should have both a mountPoint and storageDescription attribute.
+     The following attributes are optional:
+
+        primary:    (boolean) this storage is the primary external storage
+        removable:  (boolean) this is removable storage (for example, a real SD card)
+        emulated:   (boolean) the storage is emulated via the FUSE sdcard daemon
+        mtpReserve: (integer) number of megabytes of storage MTP should reserve for free storage
+                     (used for emulated storage that is shared with system's data partition)
+
+      A storage should not have both emulated and removable set to true
+-->
+
+<StorageList xmlns:android="http://schemas.android.com/apk/res/android">
+    <storage android:mountPoint="/mnt/sdcard"
+             android:storageDescription="@string/storage_sd_card"
+             android:primary="true"
+             android:removable="true"
+             android:allowMassStorage="true" />
+</StorageList>
diff --git a/prebuilt/init.htcleo.rc b/prebuilt/init.htcleo.rc
index 462cf9d..bd4a4b4 100644
--- a/prebuilt/init.htcleo.rc
+++ b/prebuilt/init.htcleo.rc
@@ -28,11 +28,7 @@ on fs
     write /data/drm/rights/mid.txt 0
     chmod 0777 /data/drm/rights/mid.txt
 
-    setprop vold.post_fs_data_done 1
-
-on boot
-    mount debugfs /sys/kernel/debug /sys/kernel/debug
-
+on post-fs-data
     mkdir /data/misc/wifi 0770 wifi wifi
     mkdir /data/misc/wifi/sockets 0770 wifi wifi
     mkdir /data/misc/dhcp 0770 dhcp dhcp
@@ -40,6 +36,9 @@ on boot
 
     setprop vold.post_fs_data_done 1
 
+on boot
+    mount debugfs /sys/kernel/debug /sys/kernel/debug
+
     # bluetooth power up/down interface
     chown bluetooth bluetooth /sys/class/rfkill/rfkill0/type
     chown bluetooth bluetooth /sys/class/rfkill/rfkill0/state