Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24ec9e87 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by Android (Google) Code Review
Browse files

Merge "Don't set useAdminDisabledSummary when there is already a summary." into nyc-dev

parents bfde3fd0 b3dc3f29

src/com/android/settings/accessibility/AccessibilitySettings.java

+1 −4
Original line number Diff line number Diff line
@@ -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.setOrder(i);

            preference.setFragment(ToggleAccessibilityServicePreferenceFragment.class.getName());

src/com/android/settings/inputmethod/InputMethodPreference.java

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ class InputMethodPreference extends RestrictedSwitchPreference implements OnPref 
                && mInputMethodSettingValues.isValidSystemNonAuxAsciiCapableIme(imi, context);

        setOnPreferenceClickListener(this);

        setOnPreferenceChangeListener(this);

        useAdminDisabledSummary(true);

    }



    public InputMethodInfo getInputMethodInfo() {