Merge "Rename SettingsUtils to PrintSettingsUtils"
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index 0d7444a..ab162fb 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -176,13 +176,13 @@
private void onPreferenceToggled(String preferenceKey, boolean enabled) {
ComponentName service = ComponentName.unflattenFromString(preferenceKey);
- List<ComponentName> services = SettingsUtils.readEnabledPrintServices(getActivity());
+ List<ComponentName> services = PrintSettingsUtils.readEnabledPrintServices(getActivity());
if (enabled) {
services.add(service);
} else {
services.remove(service);
}
- SettingsUtils.writeEnabledPrintServices(getActivity(), services);
+ PrintSettingsUtils.writeEnabledPrintServices(getActivity(), services);
}
@Override
@@ -278,7 +278,7 @@
}
private void updateUiForServiceState() {
- List<ComponentName> services = SettingsUtils.readEnabledPrintServices(getActivity());
+ List<ComponentName> services = PrintSettingsUtils.readEnabledPrintServices(getActivity());
mServiceEnabled = services.contains(mComponentName);
if (mServiceEnabled) {
mToggleSwitch.setCheckedInternal(true);
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index d4fb0fa..07e70d8 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -181,7 +181,7 @@
mPrintServicesCategory.removeAll();
}
- List<ComponentName> enabledServices = SettingsUtils
+ List<ComponentName> enabledServices = PrintSettingsUtils
.readEnabledPrintServices(getActivity());
List<ResolveInfo> installedServices = getActivity().getPackageManager()
diff --git a/src/com/android/settings/print/SettingsUtils.java b/src/com/android/settings/print/PrintSettingsUtils.java
similarity index 97%
rename from src/com/android/settings/print/SettingsUtils.java
rename to src/com/android/settings/print/PrintSettingsUtils.java
index 37827e6..24f20d5 100644
--- a/src/com/android/settings/print/SettingsUtils.java
+++ b/src/com/android/settings/print/PrintSettingsUtils.java
@@ -26,11 +26,11 @@
/**
* Helper methods for reading and writing to print settings.
*/
-public class SettingsUtils {
+public class PrintSettingsUtils {
private static final char ENABLED_PRINT_SERVICES_SEPARATOR = ':';
- private SettingsUtils() {
+ private PrintSettingsUtils() {
/* do nothing */
}