summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Hamilton <jham@android.com>2010-10-25 14:46:45 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-10-25 14:46:45 -0700
commit106165b5102be226eb8049d2f7f62d7e26034e8a (patch)
tree421216e6673a7856f81ae887c6fc7942391f7299
parent8c32bddfac259543f4ed87341fce42bc5ed60506 (diff)
parente0be933ec7c05826683e61665644bf106f081f34 (diff)
downloadframeworks_base-106165b5102be226eb8049d2f7f62d7e26034e8a.zip
frameworks_base-106165b5102be226eb8049d2f7f62d7e26034e8a.tar.gz
frameworks_base-106165b5102be226eb8049d2f7f62d7e26034e8a.tar.bz2
Merge "Add a RHS status bar slot for NFC." into gingerbread
-rw-r--r--core/res/res/values/config.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 99fc5c2..642a563 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -32,6 +32,7 @@
<item><xliff:g id="id">sync_active</xliff:g></item>
<item><xliff:g id="id">gps</xliff:g></item>
<item><xliff:g id="id">bluetooth</xliff:g></item>
+ <item><xliff:g id="id">nfc</xliff:g></item>
<item><xliff:g id="id">tty</xliff:g></item>
<item><xliff:g id="id">speakerphone</xliff:g></item>
<item><xliff:g id="id">mute</xliff:g></item>