diff options
author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-11-23 06:51:34 +0100 |
---|---|---|
committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-11-23 06:51:34 +0100 |
commit | 45bc4b754b3a89d39caac8f9b58b14182c67ecf6 (patch) | |
tree | 5c052d202b6c9ce9219b5c97167319677a9889f4 /overlay/frameworks/base/core/res/res/xml/storage_list.xml | |
parent | 8dc38ab89576751c794f2a8a675628f38718f246 (diff) | |
parent | 214d003a47e7fe2962df667c5d65bce92a21a40e (diff) | |
download | device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.zip device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.tar.gz device_samsung_tuna-45bc4b754b3a89d39caac8f9b58b14182c67ecf6.tar.bz2 |
Merge remote-tracking branch 'remotes/google/jb-mr1-release' into HEAD
Conflicts:
audio/audio_hw.c
init.tuna.rc
overlay/frameworks/base/core/res/res/xml/storage_list.xml
recovery/Android.mk
Change-Id: I0b13c6b5e61ea709b0e9aaa1c7b798684b33873a
Diffstat (limited to 'overlay/frameworks/base/core/res/res/xml/storage_list.xml')
-rw-r--r-- | overlay/frameworks/base/core/res/res/xml/storage_list.xml | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/overlay/frameworks/base/core/res/res/xml/storage_list.xml b/overlay/frameworks/base/core/res/res/xml/storage_list.xml index 49cc7ae..344fe1e 100644 --- a/overlay/frameworks/base/core/res/res/xml/storage_list.xml +++ b/overlay/frameworks/base/core/res/res/xml/storage_list.xml @@ -17,31 +17,12 @@ */ --> -<!-- 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 path="/mnt/sdcard". - Each storage should have both a path and description attribute set. - The following boolean attributes are optional: - - primary: this storage is the primary external storage - removable: this is removable storage (for example, a real SD card) - emulated: the storage is emulated via the FUSE sdcard daemon - mtp-reserve: 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 ---> +<!-- See storage config details at http://source.android.com/tech/storage/ --> <StorageList xmlns:android="http://schemas.android.com/apk/res/android"> - <storage android:mountPoint="/storage/sdcard0" - android:storageDescription="@string/storage_internal" - android:primary="true" - android:emulated="true" - android:mtpReserve="100" /> - - <storage android:mountPoint="/storage/usbdisk" - android:storageDescription="@string/storage_usb" - android:primary="false" - android:removable="true" /> - + <!-- internal emulated storage --> + <storage + android:storageDescription="@string/storage_internal" + android:emulated="true" + android:mtpReserve="100" /> </StorageList> |