From b3dc3f2983e7d48703119cb5455bc6a15cbb72b7 Mon Sep 17 00:00:00 2001
From: Sudheer Shanka <sudheersai@google.com>
Date: Wed, 16 Mar 2016 11:42:58 -0700
Subject: [PATCH] Don't set useAdminDisabledSummary when there is already a
 summary.

Bug: 27155568
Change-Id: If2a7bf127307731b2e2258dc6389caed13950f79
---
 .../settings/accessibility/AccessibilitySettings.java        | 5 +----
 .../android/settings/inputmethod/InputMethodPreference.java  | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index ef841d3a4b2..62671fa30e8 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -471,7 +471,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
             AccessibilityServiceInfo info = installedServices.get(i);
 
             RestrictedPreference preference = new RestrictedPreference(getActivity());
-            preference.useAdminDisabledSummary(true);
             String title = info.getResolveInfo().loadLabel(getPackageManager()).toString();
 
             ServiceInfo serviceInfo = info.getResolveInfo().serviceInfo;
@@ -506,9 +505,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
                 preference.setEnabled(true);
             }
 
-            if (serviceAllowed) {
-                preference.setSummary(serviceEnabledString);
-            }
+            preference.setSummary(serviceEnabledString);
 
             preference.setOrder(i);
             preference.setFragment(ToggleAccessibilityServicePreferenceFragment.class.getName());
diff --git a/src/com/android/settings/inputmethod/InputMethodPreference.java b/src/com/android/settings/inputmethod/InputMethodPreference.java
index 11464bf180d..3d6e7dced7c 100755
--- a/src/com/android/settings/inputmethod/InputMethodPreference.java
+++ b/src/com/android/settings/inputmethod/InputMethodPreference.java
@@ -121,7 +121,6 @@ class InputMethodPreference extends RestrictedSwitchPreference implements OnPref
                 && mInputMethodSettingValues.isValidSystemNonAuxAsciiCapableIme(imi, context);
         setOnPreferenceClickListener(this);
         setOnPreferenceChangeListener(this);
-        useAdminDisabledSummary(true);
     }
 
     public InputMethodInfo getInputMethodInfo() {