Merge "Add A11y Slices" into pi-dev am: bc4c392ff4
am: c82cf95105
Change-Id: Iabff6994e9a4eb67d2702eb949f6e60939db0508
This commit is contained in:
@@ -344,6 +344,21 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
|
||||
return super.onPreferenceTreeClick(preference);
|
||||
}
|
||||
|
||||
public static CharSequence getServiceSummary(Context context, AccessibilityServiceInfo info,
|
||||
boolean serviceEnabled) {
|
||||
final String serviceState = serviceEnabled
|
||||
? context.getString(R.string.accessibility_summary_state_enabled)
|
||||
: context.getString(R.string.accessibility_summary_state_disabled);
|
||||
final CharSequence serviceSummary = info.loadSummary(context.getPackageManager());
|
||||
final String stateSummaryCombo = context.getString(
|
||||
R.string.preference_summary_default_combination,
|
||||
serviceState, serviceSummary);
|
||||
|
||||
return (TextUtils.isEmpty(serviceSummary))
|
||||
? serviceState
|
||||
: stateSummaryCombo;
|
||||
}
|
||||
|
||||
private void handleToggleTextContrastPreferenceClick() {
|
||||
Settings.Secure.putInt(getContentResolver(),
|
||||
Settings.Secure.ACCESSIBILITY_HIGH_TEXT_CONTRAST_ENABLED,
|
||||
@@ -545,15 +560,9 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
|
||||
preference.setSummary(R.string.accessibility_summary_state_stopped);
|
||||
description = getString(R.string.accessibility_description_state_stopped);
|
||||
} else {
|
||||
final String serviceState = serviceEnabled ?
|
||||
getString(R.string.accessibility_summary_state_enabled) :
|
||||
getString(R.string.accessibility_summary_state_disabled);
|
||||
final CharSequence serviceSummary = info.loadSummary(getPackageManager());
|
||||
final String stateSummaryCombo = getString(
|
||||
R.string.preference_summary_default_combination,
|
||||
serviceState, serviceSummary);
|
||||
preference.setSummary((TextUtils.isEmpty(serviceSummary)) ? serviceState
|
||||
: stateSummaryCombo);
|
||||
final CharSequence serviceSummary = getServiceSummary(getContext(), info,
|
||||
serviceEnabled);
|
||||
preference.setSummary(serviceSummary);
|
||||
}
|
||||
|
||||
// Disable all accessibility services that are not permitted.
|
||||
|
@@ -0,0 +1,108 @@
|
||||
/*
|
||||
* Copyright (C) 2018 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.accessibility;
|
||||
|
||||
import android.accessibilityservice.AccessibilityServiceInfo;
|
||||
import android.content.ComponentName;
|
||||
import android.content.ContentResolver;
|
||||
import android.content.Context;
|
||||
import android.provider.Settings;
|
||||
import android.view.accessibility.AccessibilityManager;
|
||||
|
||||
import com.android.settings.accessibility.AccessibilitySettings;
|
||||
import com.android.settings.core.TogglePreferenceController;
|
||||
import com.android.settingslib.accessibility.AccessibilityUtils;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* PreferenceController for accessibility services to be used by Slices.
|
||||
* Wraps the common logic which enables accessibility services and checks their availability.
|
||||
* <p>
|
||||
* Should not be used in a {@link com.android.settings.dashboard.DashboardFragment}.
|
||||
*/
|
||||
public class AccessibilitySlicePreferenceController extends TogglePreferenceController {
|
||||
|
||||
private final ComponentName mComponentName;
|
||||
|
||||
private final int ON = 1;
|
||||
private final int OFF = 0;
|
||||
|
||||
public AccessibilitySlicePreferenceController(Context context, String preferenceKey) {
|
||||
super(context, preferenceKey);
|
||||
mComponentName = ComponentName.unflattenFromString(getPreferenceKey());
|
||||
|
||||
if (mComponentName == null) {
|
||||
throw new IllegalArgumentException(
|
||||
"Illegal Component Name from: " + preferenceKey);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public CharSequence getSummary() {
|
||||
final AccessibilityServiceInfo serviceInfo = getAccessibilityServiceInfo();
|
||||
return serviceInfo == null
|
||||
? "" : AccessibilitySettings.getServiceSummary(mContext, serviceInfo, isChecked());
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isChecked() {
|
||||
final ContentResolver contentResolver = mContext.getContentResolver();
|
||||
final boolean accessibilityEnabled = Settings.Secure.getInt(contentResolver,
|
||||
Settings.Secure.ACCESSIBILITY_ENABLED, OFF) == ON;
|
||||
|
||||
if (!accessibilityEnabled) {
|
||||
return false;
|
||||
}
|
||||
|
||||
final Set<ComponentName> componentNames =
|
||||
AccessibilityUtils.getEnabledServicesFromSettings(mContext);
|
||||
|
||||
return componentNames.contains(mComponentName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean setChecked(boolean isChecked) {
|
||||
if (getAccessibilityServiceInfo() == null) {
|
||||
return false;
|
||||
}
|
||||
AccessibilityUtils.setAccessibilityServiceState(mContext, mComponentName, isChecked);
|
||||
return isChecked == isChecked(); // Verify that it was probably changed.
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getAvailabilityStatus() {
|
||||
// Return unsupported when the service is disabled or not installed.
|
||||
return getAccessibilityServiceInfo() == null ? DISABLED_UNSUPPORTED : AVAILABLE;
|
||||
}
|
||||
|
||||
private AccessibilityServiceInfo getAccessibilityServiceInfo() {
|
||||
final AccessibilityManager accessibilityManager = mContext.getSystemService(
|
||||
AccessibilityManager.class);
|
||||
final List<AccessibilityServiceInfo> serviceList =
|
||||
accessibilityManager.getInstalledAccessibilityServiceList();
|
||||
|
||||
for (AccessibilityServiceInfo serviceInfo : serviceList) {
|
||||
if (mComponentName.equals(serviceInfo.getComponentName())) {
|
||||
return serviceInfo;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user