Merge "Remove "Android System" from recent apps list in Settings (b/10855277)" into klp-dev
diff --git a/res/drawable-hdpi/ic_print.png b/res/drawable-hdpi/ic_print.png
deleted file mode 100644
index aaff3dd..0000000
--- a/res/drawable-hdpi/ic_print.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_print.png b/res/drawable-mdpi/ic_print.png
deleted file mode 100644
index a3954b5..0000000
--- a/res/drawable-mdpi/ic_print.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_print.png b/res/drawable-xhdpi/ic_print.png
deleted file mode 100644
index 6b55a14..0000000
--- a/res/drawable-xhdpi/ic_print.png
+++ /dev/null
Binary files differ
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d101330..e3e2170 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 55b3bca..8744328 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -192,7 +192,7 @@
<header
android:id="@+id/print_settings"
android:fragment="com.android.settings.print.PrintSettingsFragment"
- android:icon="@drawable/ic_print"
+ android:icon="@*android:drawable/ic_print"
android:title="@string/print_settings" />
<!-- Development -->
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);
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index d254842..49f0e65 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -65,6 +65,9 @@
static final String EXTRA_ADD_PRINTERS_COMPONENT_NAME = "add_printers_component_name";
static final String EXTRA_SERVICE_COMPONENT_NAME = "service_component_name";
+ private static final String EXTRA_PRINT_SERVICE_COMPONENT_NAME =
+ "EXTRA_PRINT_SERVICE_COMPONENT_NAME";
+
private final PackageMonitor mSettingsPackageMonitor = new SettingsPackageMonitor();
private final Handler mHandler = new Handler() {
@@ -97,6 +100,7 @@
mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
mSettingsContentObserver.register(getContentResolver());
updateServicesPreferences();
+ startPrintServiceSettingsIfNeeded();
setHasOptionsMenu(true);
}
@@ -213,6 +217,20 @@
}
}
+ private void startPrintServiceSettingsIfNeeded() {
+ if (getArguments() == null) {
+ return;
+ }
+ String componentName = getArguments().getString(EXTRA_PRINT_SERVICE_COMPONENT_NAME);
+ if (componentName != null) {
+ getArguments().remove(EXTRA_PRINT_SERVICE_COMPONENT_NAME);
+ Preference prereference = findPreference(componentName);
+ if (prereference != null) {
+ prereference.performClick(getPreferenceScreen());
+ }
+ }
+ }
+
private class SettingsPackageMonitor extends PackageMonitor {
@Override
public void onPackageAdded(String packageName, int uid) {
