diff options
author | Tom O'Neill <tomo@google.com> | 2014-03-03 10:17:52 -0800 |
---|---|---|
committer | Tom O'Neill <tomo@google.com> | 2014-03-03 10:17:52 -0800 |
commit | 34501ae25893a2c36ce4860e96dd208950d75690 (patch) | |
tree | 8bf3f27c18a36d810bb8f1a16b0804d3e4ce16f5 /src/com/android/settings/location | |
parent | adda1b0022f12dd15a802ec36e6efee0f9c6bff2 (diff) | |
download | packages_apps_Settings-34501ae25893a2c36ce4860e96dd208950d75690.zip packages_apps_Settings-34501ae25893a2c36ce4860e96dd208950d75690.tar.gz packages_apps_Settings-34501ae25893a2c36ce4860e96dd208950d75690.tar.bz2 |
Ignore any summary provided for injected settings
Bug: 13279850
Change-Id: I1e5a39c9542b3121835f61cd0ce82612c7948cd7
Diffstat (limited to 'src/com/android/settings/location')
-rw-r--r-- | src/com/android/settings/location/SettingsInjector.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/android/settings/location/SettingsInjector.java b/src/com/android/settings/location/SettingsInjector.java index b919080..76b3103 100644 --- a/src/com/android/settings/location/SettingsInjector.java +++ b/src/com/android/settings/location/SettingsInjector.java @@ -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) { Preference pref = new Preference(mContext); pref.setTitle(info.title); - pref.setSummary(R.string.location_loading_injected_setting); + pref.setSummary(null); PackageManager pm = mContext.getPackageManager(); Drawable icon = pm.getDrawable(info.packageName, info.iconId, null); pref.setIcon(icon); @@ -425,12 +425,11 @@ class SettingsInjector { @Override public void handleMessage(Message msg) { Bundle bundle = msg.getData(); - 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(summary); + preference.setSummary(null); preference.setEnabled(enabled); mHandler.sendMessage( mHandler.obtainMessage(WHAT_RECEIVED_STATUS, Setting.this)); |