summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-10-04 14:54:59 -0700
committerDianne Hackborn <hackbod@google.com>2010-10-04 14:54:59 -0700
commit58520b24d40bb2587f394a52535dab4f2736bab1 (patch)
tree09b3f3ed6d4c68f0084df07a8b880884d109e071 /core/res
parent5e9f64ce24b3381ee48f9e12242aba5216f136a4 (diff)
parent10d5b0966d1b6ab0e3b63c71d5325403e75b647e (diff)
downloadframeworks_base-58520b24d40bb2587f394a52535dab4f2736bab1.zip
frameworks_base-58520b24d40bb2587f394a52535dab4f2736bab1.tar.gz
frameworks_base-58520b24d40bb2587f394a52535dab4f2736bab1.tar.bz2
resolved conflicts for merge of 10d5b096 to master
Change-Id: Id5c6ba651f72b48f0d70ee2ca64a6c9adf5e74f7
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/values/config.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index f704874..71967d4 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -82,6 +82,15 @@
<!-- Set to true if external storage is case sensitive.
Typically external storage is FAT, which is case insensitive. -->
<bool name="config_caseSensitiveExternalStorage">false</bool>
+
+ <!-- A product with no SD card == not removable. -->
+ <bool name="config_externalStorageRemovable" product="nosdcard">false</bool>
+ <!-- Configures whether the primary external storage device is
+ removable. For example, if external storage is on an SD card,
+ it is removable; if it is built in to the device, it is not removable.
+ The default product has external storage on an SD card, which is
+ removable. -->
+ <bool name="config_externalStorageRemovable" product="default">true</bool>
<!-- XXXXX NOTE THE FOLLOWING RESOURCES USE THE WRONG NAMING CONVENTION.
Please don't copy them, copy anything else. -->