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

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

Browse Source 
am: 24ec9e8

* commit '24ec9e872cac073fa7b21137dd50ec95cadc9823':
  Don't set useAdminDisabledSummary when there is already a summary.
This commit is contained in:
Sudheer Shanka
2016-03-16 18:55:02 +00:00
committed by android-build-merger
parent 9adb7bd370 24ec9e872c
commit 5dfe72854f
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -471,7 +471,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
AccessibilityServiceInfo info = installedServices.get(i); AccessibilityServiceInfo info = installedServices.get(i);
RestrictedPreference preference = new RestrictedPreference(getActivity()); RestrictedPreference preference = new RestrictedPreference(getActivity());
preference.useAdminDisabledSummary(true);
String title = info.getResolveInfo().loadLabel(getPackageManager()).toString(); String title = info.getResolveInfo().loadLabel(getPackageManager()).toString();
ServiceInfo serviceInfo = info.getResolveInfo().serviceInfo; ServiceInfo serviceInfo = info.getResolveInfo().serviceInfo;
@@ -506,9 +505,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
preference.setEnabled(true); preference.setEnabled(true);
} }
if (serviceAllowed) {
preference.setSummary(serviceEnabledString); preference.setSummary(serviceEnabledString);
}
preference.setOrder(i); preference.setOrder(i);
preference.setFragment(ToggleAccessibilityServicePreferenceFragment.class.getName()); preference.setFragment(ToggleAccessibilityServicePreferenceFragment.class.getName());

1
src/com/android/settings/inputmethod/InputMethodPreference.java
View File

@@ -121,7 +121,6 @@ class InputMethodPreference extends RestrictedSwitchPreference implements OnPref
&& mInputMethodSettingValues.isValidSystemNonAuxAsciiCapableIme(imi, context); && mInputMethodSettingValues.isValidSystemNonAuxAsciiCapableIme(imi, context);
setOnPreferenceClickListener(this); setOnPreferenceClickListener(this);
setOnPreferenceChangeListener(this); setOnPreferenceChangeListener(this);
useAdminDisabledSummary(true);
} }
public InputMethodInfo getInputMethodInfo() { public InputMethodInfo getInputMethodInfo() {