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

am 96cd9e7c: First accessibility device disabled if enableing a second one is canceled.

Browse Source 
* commit '96cd9e7cc7d830756f42aa715e0062f938d4ae55':
  First accessibility device disabled if enableing a second one is canceled.
This commit is contained in:
Svetoslav
2013-04-10 17:56:25 -07:00
committed by Android Git Automerger
parent 5d46a54c55 96cd9e7cc7
commit fce2148f3c
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/AccessibilitySettings.java
View File

@@ -726,25 +726,22 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
// Determine enabled services and accessibility state.
ComponentName toggledService = ComponentName.unflattenFromString(preferenceKey);
final boolean accessibilityEnabled;
boolean accessibilityEnabled = false;
if (enabled) {
enabledServices.add(toggledService);
// Enabling at least one service enables accessibility.
accessibilityEnabled = true;
enabledServices.add(toggledService);
} else {
enabledServices.remove(toggledService);
// Check how many enabled and installed services are present.
int enabledAndInstalledServiceCount = 0;
Set<ComponentName> installedServices = sInstalledServices;
for (ComponentName enabledService : enabledServices) {
if (installedServices.contains(enabledService)) {
enabledAndInstalledServiceCount++;
// Disabling the last service disables accessibility.
accessibilityEnabled = true;
break;
}
}
// Disabling the last service disables accessibility.
accessibilityEnabled = enabledAndInstalledServiceCount > 1
|| (enabledAndInstalledServiceCount == 1
&& !installedServices.contains(toggledService));
enabledServices.remove(toggledService);
}
// Update the enabled services setting.