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

Merge "Ignore any summary provided for injected settings"

Browse Source
This commit is contained in:
Tom O'Neill
2014-03-03 18:49:42 +00:00
committed by Android (Google) Code Review
parent 947d8143b9 34501ae258
commit ee4f84b0fb
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -244,12 +244,12 @@ class SettingsInjector {
} }
/** /**
* Adds an injected setting to the root with status "Loading...". * Adds an injected setting to the root.
*/ */
private Preference addServiceSetting(List<Preference> prefs, InjectedSetting info) { private Preference addServiceSetting(List<Preference> prefs, InjectedSetting info) {
Preference pref = new Preference(mContext); Preference pref = new Preference(mContext);
pref.setTitle(info.title); pref.setTitle(info.title);
pref.setSummary(R.string.location_loading_injected_setting); pref.setSummary(null);
PackageManager pm = mContext.getPackageManager(); PackageManager pm = mContext.getPackageManager();
Drawable icon = pm.getDrawable(info.packageName, info.iconId, null); Drawable icon = pm.getDrawable(info.packageName, info.iconId, null);
pref.setIcon(icon); pref.setIcon(icon);
@@ -425,12 +425,11 @@ class SettingsInjector {
@Override @Override
public void handleMessage(Message msg) { public void handleMessage(Message msg) {
Bundle bundle = msg.getData(); Bundle bundle = msg.getData();
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(summary); preference.setSummary(null);
preference.setEnabled(enabled); preference.setEnabled(enabled);
mHandler.sendMessage( mHandler.sendMessage(
mHandler.obtainMessage(WHAT_RECEIVED_STATUS, Setting.this)); mHandler.obtainMessage(WHAT_RECEIVED_STATUS, Setting.this));