summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2010-02-04 14:26:40 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-02-04 14:26:40 -0800
commit8f3ff09556b2d0c45eebdf97bd980f3b9f0c7d8f (patch)
tree569f5c1fc582aa41207d05a5030b7bde8f553377 /core/res
parent7b4030dbe7c814c78a761d221d18eaaacfe1431e (diff)
parent2cce6267a0cdcdd3f3f369599e99f9a83bbe4be2 (diff)
downloadframeworks_base-8f3ff09556b2d0c45eebdf97bd980f3b9f0c7d8f.zip
frameworks_base-8f3ff09556b2d0c45eebdf97bd980f3b9f0c7d8f.tar.gz
frameworks_base-8f3ff09556b2d0c45eebdf97bd980f3b9f0c7d8f.tar.bz2
Merge "resolved conflicts for merge of dd24f599 to master"
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/values/config.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 2b8ddc4..46d6352 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -237,4 +237,8 @@
<!-- Component name of the service providing geocoder API support. -->
<string name="config_geocodeProvider">@null</string>
+
+ <!-- Flag indicating whether headset events are used by kernel to indicate
+ TTY mode changes. -->
+ <bool name="tty_mode_uses_headset_events">false</bool>
</resources>