From: Tom O'Neill <tomo@google.com>
Date: Mon, 26 Aug 2013 16:47:55 +0000 (-0700)
Subject: Adapt to SettingsInjectorService API changes
X-Git-Tag: android-x86-4.4-r1~203^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b578ac4f94542eb7a2988e51045b931305871b97;p=android-x86%2Fpackages-apps-Settings.git

Adapt to SettingsInjectorService API changes

- Part of fix for b/10461474

Change-Id: Ia37f444afc822a42ec21ebd2beae7aef8642547a
---

diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index 1c9409c4bb..818ec2bf88 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -180,8 +180,8 @@ public class LocationSettings extends LocationSettingsBase
                 injector.reloadStatusMessages();
             }
         };
-        activity.registerReceiver(
-                mReceiver, new IntentFilter(SettingInjectorService.UPDATE_INTENT));
+        activity.registerReceiver(mReceiver,
+                new IntentFilter(SettingInjectorService.ACTION_INJECTED_SETTING_CHANGED));
 
         if (locationServices.size() > 0) {
             addPreferencesSorted(locationServices, categoryLocationServices);
diff --git a/src/com/android/settings/location/SettingsInjector.java b/src/com/android/settings/location/SettingsInjector.java
index 532304dbfb..22e2413888 100644
--- a/src/com/android/settings/location/SettingsInjector.java
+++ b/src/com/android/settings/location/SettingsInjector.java
@@ -56,9 +56,6 @@ import java.util.Set;
  * Code-sharing would require extracting {@link
  * android.content.pm.RegisteredServicesCache#parseServiceAttributes(android.content.res.Resources,
  * String, android.util.AttributeSet)} into an interface, which didn't seem worth it.
- *
- * TODO: register a broadcast receiver that calls updateUI() when it receives
- * {@link SettingInjectorService#UPDATE_INTENT}.
  */
 class SettingsInjector {
     static final String TAG = "SettingsInjector";
@@ -278,8 +275,8 @@ class SettingsInjector {
         /**
          * Settings whose status values need to be loaded. A set is used to prevent redundant loads
          * even if {@link #reloadStatusMessages()} is called many times in rapid succession (for
-         * example, if we receive a lot of
-         * {@link android.location.SettingInjectorService#UPDATE_INTENT} broadcasts).
+         * example, if we receive a lot of {@link
+         * android.location.SettingInjectorService#ACTION_INJECTED_SETTING_CHANGED} broadcasts).
          * <p/>
          * We use a linked hash set to ensure that when {@link #reloadStatusMessages()} is called,
          * any settings that haven't been loaded yet will finish loading before any already-loaded
@@ -386,12 +383,12 @@ class SettingsInjector {
                 @Override
                 public void handleMessage(Message msg) {
                     Bundle bundle = msg.getData();
-                    String status = bundle.getString(SettingInjectorService.STATUS_KEY);
+                    String summary = bundle.getString(SettingInjectorService.SUMMARY_KEY);
                     boolean enabled = bundle.getBoolean(SettingInjectorService.ENABLED_KEY, true);
                     if (Log.isLoggable(TAG, Log.DEBUG)) {
                         Log.d(TAG, setting + ": received " + msg + ", bundle: " + bundle);
                     }
-                    preference.setSummary(status);
+                    preference.setSummary(summary);
                     preference.setEnabled(enabled);
                     mHandler.sendMessage(
                             mHandler.obtainMessage(WHAT_RECEIVED_STATUS, Setting.this));