Merge "Offer to enable a print service after it is installed (Settings)." into klp-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fce9239..e3e2170 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -684,7 +684,7 @@
<string name="show_owner_info_on_lockscreen_label">Show owner info on lock screen</string>
<!-- Text shown for title of owner info setting [CHAR LIMIT=20]-->
<string name="owner_info_settings_title">Owner info</string>
- <!-- Text shown for title of settings checkbox to disable widgets [CHAR LIMIT=20]-->
+ <!-- Text shown for title of settings checkbox to enable widgets [CHAR LIMIT=20]-->
<string name="security_enable_widgets_title">Enable widgets</string>
<!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->
<string name="security_enable_widgets_disabled_summary">Disabled by administrator</string>
@@ -2409,7 +2409,7 @@
<!-- [CHAR LIMIT=30] Location settings screen, battery saving location mode -->
<string name="location_mode_battery_saving_title">Battery saving</string>
<!-- [CHAR LIMIT=30] Location settings screen, device sensors only location mode -->
- <string name="location_mode_sensors_only_title">Device sensors only</string>
+ <string name="location_mode_sensors_only_title">Device sensors</string>
<!-- [CHAR LIMIT=30] Location settings screen, location off mode -->
<string name="location_mode_location_off_title">Location off</string>
<!-- [CHAR LIMIT=30] Location settings screen, sub category for recent location requests -->
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index e9b7419..756705d 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -281,6 +281,7 @@
mSmsApplicationPreference = (SmsListPreference) findPreference(KEY_SMS_APPLICATION);
mSmsApplicationPreference.setOnPreferenceChangeListener(this);
+ initSmsApplicationSetting();
// Remove NSD checkbox by default
getPreferenceScreen().removePreference(nsd);