PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5d821bed: Merge "Adapt to SettingsInjectorService API changes" into klp-dev

Browse Source 
* commit '5d821bedb1f065702b9920fe15a6f81bc19ba36b':
  Adapt to SettingsInjectorService API changes
This commit is contained in:
Tom O'Neill
2013-08-27 07:42:52 -07:00
committed by Android Git Automerger
parent 14983f099c 5d821bedb1
commit 4d6aaf30ea
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/location/LocationSettings.java
View File

@@ -180,8 +180,8 @@ public class LocationSettings extends LocationSettingsBase
injector.reloadStatusMessages(); injector.reloadStatusMessages();
} }
}; };
activity.registerReceiver( activity.registerReceiver(mReceiver,
mReceiver, new IntentFilter(SettingInjectorService.UPDATE_INTENT)); new IntentFilter(SettingInjectorService.ACTION_INJECTED_SETTING_CHANGED));
if (locationServices.size() > 0) { if (locationServices.size() > 0) {
addPreferencesSorted(locationServices, categoryLocationServices); addPreferencesSorted(locationServices, categoryLocationServices);

11
src/com/android/settings/location/SettingsInjector.java
View File

@@ -56,9 +56,6 @@ import java.util.Set;
* Code-sharing would require extracting {@link * Code-sharing would require extracting {@link
* android.content.pm.RegisteredServicesCache#parseServiceAttributes(android.content.res.Resources, * android.content.pm.RegisteredServicesCache#parseServiceAttributes(android.content.res.Resources,
* String, android.util.AttributeSet)} into an interface, which didn't seem worth it. * 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 { class SettingsInjector {
static final String TAG = "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 * 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 * even if {@link #reloadStatusMessages()} is called many times in rapid succession (for
* example, if we receive a lot of * example, if we receive a lot of {@link
* {@link android.location.SettingInjectorService#UPDATE_INTENT} broadcasts). * android.location.SettingInjectorService#ACTION_INJECTED_SETTING_CHANGED} broadcasts).
* <p/> * <p/>
* We use a linked hash set to ensure that when {@link #reloadStatusMessages()} is called, * 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 * any settings that haven't been loaded yet will finish loading before any already-loaded
@@ -386,12 +383,12 @@ class SettingsInjector {
@Override @Override
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
Bundle bundle = msg.getData(); 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); boolean enabled = bundle.getBoolean(SettingInjectorService.ENABLED_KEY, true);
if (Log.isLoggable(TAG, Log.DEBUG)) { if (Log.isLoggable(TAG, Log.DEBUG)) {
Log.d(TAG, setting + ": received " + msg + ", bundle: " + bundle); Log.d(TAG, setting + ": received " + msg + ", bundle: " + bundle);
} }
preference.setSummary(status); preference.setSummary(summary);
preference.setEnabled(enabled); preference.setEnabled(enabled);
mHandler.sendMessage( mHandler.sendMessage(
mHandler.obtainMessage(WHAT_RECEIVED_STATUS, Setting.this)); mHandler.obtainMessage(WHAT_RECEIVED_STATUS, Setting.this));