From 3cfa49e851f8366f991f35bf297995a45c07138f Mon Sep 17 00:00:00 2001 From: Beverly Date: Tue, 21 Aug 2018 11:35:54 -0400 Subject: [PATCH] Use title in ManagedServiceSetting dialogs - Use the title (not summary) of the preference in its warning dialogs Test: manual Bug: 112687996 Change-Id: Ia217e5252cf7a48450da853c0270093ffb57dca7 --- src/com/android/settings/utils/ManagedServiceSettings.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java index e222e569583..a448776aa38 100644 --- a/src/com/android/settings/utils/ManagedServiceSettings.java +++ b/src/com/android/settings/utils/ManagedServiceSettings.java @@ -122,6 +122,7 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings { // unlikely, as we are iterating over live services. Log.e(TAG, "can't find package name", e); } + final String finalTitle = title.toString(); final String summary = service.loadLabel(mPm).toString(); final SwitchPreference pref = new AppSwitchPreference(getPrefContext()); pref.setPersistent(false); @@ -142,7 +143,7 @@ public abstract class ManagedServiceSettings extends EmptyTextSettings { } pref.setOnPreferenceChangeListener((preference, newValue) -> { final boolean enable = (boolean) newValue; - return setEnabled(cn, summary, enable); + return setEnabled(cn, finalTitle, enable); }); pref.setKey(cn.flattenToString()); screen.addPreference(pref);