summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Braun <dabraun@google.com>2013-09-20 00:26:32 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-20 00:26:32 +0000
commit3372cb2654e002e953e15d1b8513f090e9b6997d (patch)
tree9f9e86ff8c5d7df7c19af19d7a252928b0cd133c
parent9d53e30e5eaf53cb0bd57319e02025ba7182bba3 (diff)
parentb2bae41b82320893d24853997512b6cca6ad251d (diff)
downloadframeworks_base-3372cb2654e002e953e15d1b8513f090e9b6997d.zip
frameworks_base-3372cb2654e002e953e15d1b8513f090e9b6997d.tar.gz
frameworks_base-3372cb2654e002e953e15d1b8513f090e9b6997d.tar.bz2
Merge "Add config setting for default sms app." into klp-dev
-rw-r--r--core/res/res/values/config.xml7
-rw-r--r--core/res/res/values/symbols.xml1
2 files changed, 8 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 2c1a3c1..0adda56 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -828,6 +828,13 @@
cell broadcasting sms, and MMS. -->
<bool name="config_sms_capable">true</bool>
+ <!-- Default SMS Application. This will be the default SMS application when
+ the phone first boots. The user can then change the default app to oe
+ of their choosing.
+ This can be overridden for devices where a different default SMS
+ application is desired. -->
+ <string name="default_sms_application" translatable="false">com.android.mms</string>
+
<!-- Enable/disable default bluetooth profiles:
HSP_AG, ObexObjectPush, Audio, NAP -->
<bool name="config_bluetooth_default_profiles">true</bool>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index e82c0e1..a491612 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -755,6 +755,7 @@
<java-symbol type="string" name="sipAddressTypeHome" />
<java-symbol type="string" name="sipAddressTypeOther" />
<java-symbol type="string" name="sipAddressTypeWork" />
+ <java-symbol type="string" name="default_sms_application" />
<java-symbol type="string" name="sms_control_message" />
<java-symbol type="string" name="sms_control_title" />
<java-symbol type="string" name="sms_control_no" />