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

A11y shortcut settings enhancement

Browse Source 
Adding shortcut on/off switch, improving the service picker,
and adding a switch to enable the shortcut on the lock screen.

Also adjusted setting search code to avoid indexing the
accessibility shortcut aside from the main accessibility settings
page.

Bug: 35872328
Bug: 35219988
Test: Ran in a variety of conditions, ran existing settings test.
Also added basic robo test, verified existing robo tests pass.
Change-Id: I4da9bad74caf96d9c8f3640e7db5417b4ee5d602
This commit is contained in:
Phil Weaver
2017-03-16 14:52:31 -07:00
parent d3505c76cd
commit 296b7263ad
11 changed files with 482 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,11 +17,9 @@
package com.android.settings.accessibility;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.Dialog;
import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo;
import android.content.res.Resources;
@@ -130,9 +128,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
// presentation.
private static final long DELAY_UPDATE_SERVICES_MILLIS = 1000;
// ID for dialog that confirms shortcut capabilities
private static final int DIALOG_ID_ADD_SHORTCUT_WARNING = 1;
private final Map<String, String> mLongPressTimeoutValueToTitleMap = new HashMap<>();
private final Handler mHandler = new Handler();
@@ -205,7 +200,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
private Preference mDisplayMagnificationPreferenceScreen;
private Preference mFontSizePreferenceScreen;
private Preference mAutoclickPreferenceScreen;
private ListPreference mAccessibilityShortcutPreference;
private Preference mAccessibilityShortcutPreferenceScreen;
private Preference mDisplayDaltonizerPreferenceScreen;
private SwitchPreference mToggleInversionPreference;
@@ -264,9 +259,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
} else if (mToggleInversionPreference == preference) {
handleToggleInversionPreferenceChange((Boolean) newValue);
return true;
} else if (mAccessibilityShortcutPreference == preference) {
handleAccessibilityShortcutPreferenceChange((String) newValue);
return true;
}
return false;
}
@@ -283,58 +275,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, (checked ? 1 : 0));
}
private void handleAccessibilityShortcutPreferenceChange(String serviceComponentName) {
// When assigning a service to the shortcut the user must explicitly agree to the same
// capabilities that are present if the service were being enabled.
// No need if clearing the setting or the service is already enabled.
if (TextUtils.isEmpty(serviceComponentName)
|| AccessibilityUtils.getEnabledServicesFromSettings(getActivity())
.contains(ComponentName.unflattenFromString(serviceComponentName))) {
Settings.Secure.putString(getContentResolver(),
Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE, serviceComponentName);
updateAccessibilityShortcut();
return;
}
if (!serviceComponentName.equals(mAccessibilityShortcutPreference.getValue())) {
showDialog(DIALOG_ID_ADD_SHORTCUT_WARNING);
}
}
@Override
public Dialog onCreateDialog(int dialogId) {
switch (dialogId) {
case DIALOG_ID_ADD_SHORTCUT_WARNING: {
DialogInterface.OnClickListener listener =
(DialogInterface dialogInterface, int buttonId) -> {
if (buttonId == DialogInterface.BUTTON_POSITIVE) {
Settings.Secure.putString(getContentResolver(),
Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE,
mAccessibilityShortcutPreference.getValue());
}
updateAccessibilityShortcut();
};
AccessibilityServiceInfo info = AccessibilityManager.getInstance(getActivity())
.getInstalledServiceInfoWithComponentName(
ComponentName.unflattenFromString(
mAccessibilityShortcutPreference.getValue()));
if (info == null) {
return null;
}
return AccessibilityServiceWarning
.createCapabilitiesDialog(getActivity(), info, listener);
}
default: {
throw new IllegalArgumentException();
}
}
}
@Override
public int getDialogMetricsCategory(int dialogId) {
// The only dialog is the one that confirms the properties for the accessibility shortcut
return MetricsEvent.ACCESSIBILITY_TOGGLE_GLOBAL_GESTURE;
}
@Override
public boolean onPreferenceTreeClick(Preference preference) {
if (mToggleHighTextContrastPreference == preference) {
@@ -458,9 +398,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
mDisplayDaltonizerPreferenceScreen = findPreference(DISPLAY_DALTONIZER_PREFERENCE_SCREEN);
// Accessibility shortcut
mAccessibilityShortcutPreference =
(ListPreference) findPreference(ACCESSIBILITY_SHORTCUT_PREFERENCE);
mAccessibilityShortcutPreference.setOnPreferenceChangeListener(this);
mAccessibilityShortcutPreferenceScreen = findPreference(ACCESSIBILITY_SHORTCUT_PREFERENCE);
}
private void updateAllPreferences() {
@@ -651,7 +589,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
updateAutoclickSummary(mAutoclickPreferenceScreen);
updateAccessibilityShortcut();
updateAccessibilityShortcut(mAccessibilityShortcutPreferenceScreen);
}
private void updateFeatureSummary(String prefKey, Preference pref) {
@@ -700,35 +638,21 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
mToggleMasterMonoPreference.setChecked(masterMono);
}
private void updateAccessibilityShortcut() {
String currentShortcutNameString =
AccessibilityUtils.getShortcutTargetServiceComponentNameString(getActivity(),
UserHandle.myUserId());
final PackageManager pm = getPackageManager();
final AccessibilityManager accessibilityManager = getActivity()
.getSystemService(AccessibilityManager.class);
final List<AccessibilityServiceInfo> installedServices =
accessibilityManager.getInstalledAccessibilityServiceList();
final int numInstalledServices = installedServices.size();
CharSequence[] entries = new CharSequence[numInstalledServices + 1];
CharSequence[] entryValues = new CharSequence[numInstalledServices + 1];
int currentSettingIndex = numInstalledServices;
for (int i = 0; i < numInstalledServices; i++) {
AccessibilityServiceInfo installedService = installedServices.get(i);
entries[i] = installedService.getResolveInfo().loadLabel(pm);
entryValues[i] = installedService.getComponentName().flattenToShortString();
if (installedService.getId().equals(currentShortcutNameString)) {
currentSettingIndex = i;
}
private void updateAccessibilityShortcut(Preference preference) {
if (AccessibilityManager.getInstance(getActivity())
.getInstalledAccessibilityServiceList().isEmpty()) {
mAccessibilityShortcutPreferenceScreen
.setSummary(getString(R.string.accessibility_no_services_installed));
mAccessibilityShortcutPreferenceScreen.setEnabled(false);
} else {
mAccessibilityShortcutPreferenceScreen.setEnabled(true);
boolean shortcutEnabled =
AccessibilityUtils.isShortcutEnabled(getContext(), UserHandle.myUserId());
CharSequence summary = shortcutEnabled
? AccessibilityShortcutPreferenceFragment.getServiceName(getContext())
: getString(R.string.accessibility_feature_state_off);
mAccessibilityShortcutPreferenceScreen.setSummary(summary);
}
entries[numInstalledServices] =
getString(com.android.internal.R.string.disable_accessibility_shortcut);
entryValues[numInstalledServices] = "";
mAccessibilityShortcutPreference.setEntryValues(entryValues);
mAccessibilityShortcutPreference.setEntries(entries);
mAccessibilityShortcutPreference.setSummary(entries[currentSettingIndex]);
mAccessibilityShortcutPreference.setValueIndex(currentSettingIndex);
}
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =