Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Refines volume key shortcut confirm dialog strings" into rvc-dev am: 084b2de544 am: 6a7ce20a46

Browse Source 
Change-Id: Ia6f1ca78b252520fca68e24ec7ed277b5bb93090
This commit is contained in:
Menghan Li
2020-05-12 16:36:41 +00:00
committed by Automerger Merge Worker
parent 69422b8418 6a7ce20a46
commit ef332ca77c
8 changed files with 124 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
core/java/com/android/internal/accessibility/AccessibilityShortcutController.java
View File

@@ -19,6 +19,7 @@ package com.android.internal.accessibility;
import static android.view.WindowManager.LayoutParams.TYPE_KEYGUARD_DIALOG;
import static android.view.accessibility.AccessibilityManager.ACCESSIBILITY_SHORTCUT_KEY;
import static com.android.internal.accessibility.dialog.AccessibilityTargetHelper.getTargets;
import static com.android.internal.util.ArrayUtils.convertToLongArray;
import android.accessibilityservice.AccessibilityServiceInfo;
@@ -52,6 +53,7 @@ import android.view.accessibility.AccessibilityManager;
import android.widget.Toast;
import com.android.internal.R;
import com.android.internal.accessibility.dialog.AccessibilityTarget;
import com.android.internal.util.function.pooled.PooledLambda;
import java.lang.annotation.Retention;
@@ -267,16 +269,21 @@ public class AccessibilityShortcutController {
}
private AlertDialog createShortcutWarningDialog(int userId) {
final String warningMessage = mContext.getString(
R.string.accessibility_shortcut_toogle_warning);
List<AccessibilityTarget> targets = getTargets(mContext, ACCESSIBILITY_SHORTCUT_KEY);
if (targets.size() == 0) {
return null;
}
// Avoid non-a11y users accidentally turning shortcut on without reading this carefully.
// Put "don't turn on" as the primary action.
final AlertDialog alertDialog = mFrameworkObjectProvider.getAlertDialogBuilder(
// Use SystemUI context so we pick up any theme set in a vendor overlay
mFrameworkObjectProvider.getSystemUiContext())
.setTitle(R.string.accessibility_shortcut_warning_dialog_title)
.setMessage(warningMessage)
.setTitle(getShortcutWarningTitle(targets))
.setMessage(getShortcutWarningMessage(targets))
.setCancelable(false)
.setPositiveButton(R.string.leave_accessibility_shortcut_on, null)
.setNegativeButton(R.string.disable_accessibility_shortcut,
.setNegativeButton(R.string.accessibility_shortcut_on, null)
.setPositiveButton(R.string.accessibility_shortcut_off,
(DialogInterface d, int which) -> {
Settings.Secure.putStringForUser(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_SHORTCUT_TARGET_SERVICE, "",
@@ -297,6 +304,32 @@ public class AccessibilityShortcutController {
return alertDialog;
}
private String getShortcutWarningTitle(List<AccessibilityTarget> targets) {
if (targets.size() == 1) {
return mContext.getString(
R.string.accessibility_shortcut_single_service_warning_title,
targets.get(0).getLabel());
}
return mContext.getString(
R.string.accessibility_shortcut_multiple_service_warning_title);
}
private String getShortcutWarningMessage(List<AccessibilityTarget> targets) {
if (targets.size() == 1) {
return mContext.getString(
R.string.accessibility_shortcut_single_service_warning,
targets.get(0).getLabel());
}
final StringBuilder sb = new StringBuilder();
for (AccessibilityTarget target : targets) {
sb.append(mContext.getString(R.string.accessibility_shortcut_multiple_service_list,
target.getLabel()));
}
return mContext.getString(R.string.accessibility_shortcut_multiple_service_warning,
sb.toString());
}
private AccessibilityServiceInfo getInfoForTargetService() {
final ComponentName targetComponentName = getShortcutTargetComponentName();
if (targetComponentName == null) {

2
core/java/com/android/internal/accessibility/dialog/AccessibilityTarget.java
View File

@@ -38,7 +38,7 @@ import com.android.internal.accessibility.dialog.TargetAdapter.ViewHolder;
* Abstract base class for creating various target related to accessibility service,
* accessibility activity, and white listing feature.
*/
abstract class AccessibilityTarget implements TargetOperations, OnTargetSelectedListener,
public abstract class AccessibilityTarget implements TargetOperations, OnTargetSelectedListener,
OnTargetCheckedChangeListener {
private Context mContext;
@ShortcutType

66
core/java/com/android/internal/accessibility/dialog/AccessibilityTargetHelper.java
View File

@@ -53,19 +53,61 @@ import java.util.Locale;
/**
* Collection of utilities for accessibility target.
*/
final class AccessibilityTargetHelper {
public final class AccessibilityTargetHelper {
private AccessibilityTargetHelper() {}
static List<AccessibilityTarget> getTargets(Context context,
/**
* Returns list of {@link AccessibilityTarget} of assigned accessibility shortcuts from
* {@link AccessibilityManager#getAccessibilityShortcutTargets} including accessibility
* feature's package name, component id, etc.
*
* @param context The context of the application.
* @param shortcutType The shortcut type.
* @return The list of {@link AccessibilityTarget}.
* @hide
*/
public static List<AccessibilityTarget> getTargets(Context context,
@ShortcutType int shortcutType) {
final List<AccessibilityTarget> targets = getInstalledTargets(context, shortcutType);
final AccessibilityManager ams = context.getSystemService(AccessibilityManager.class);
final List<String> requiredTargets = ams.getAccessibilityShortcutTargets(shortcutType);
targets.removeIf(target -> !requiredTargets.contains(target.getId()));
// List all accessibility target
final List<AccessibilityTarget> installedTargets = getInstalledTargets(context,
shortcutType);
return targets;
// List accessibility shortcut target
final AccessibilityManager am = (AccessibilityManager) context.getSystemService(
Context.ACCESSIBILITY_SERVICE);
final List<String> assignedTargets = am.getAccessibilityShortcutTargets(shortcutType);
// Get the list of accessibility shortcut target in all accessibility target
final List<AccessibilityTarget> results = new ArrayList<>();
for (String assignedTarget : assignedTargets) {
for (AccessibilityTarget installedTarget : installedTargets) {
if (!MAGNIFICATION_CONTROLLER_NAME.contentEquals(assignedTarget)) {
final ComponentName assignedTargetComponentName =
ComponentName.unflattenFromString(assignedTarget);
final ComponentName targetComponentName = ComponentName.unflattenFromString(
installedTarget.getId());
if (assignedTargetComponentName.equals(targetComponentName)) {
results.add(installedTarget);
continue;
}
}
if (assignedTarget.contentEquals(installedTarget.getId())) {
results.add(installedTarget);
}
}
}
return results;
}
/**
* Returns list of {@link AccessibilityTarget} of the installed accessibility service,
* accessibility activity, and white listing feature including accessibility feature's package
* name, component id, etc.
*
* @param context The context of the application.
* @param shortcutType The shortcut type.
* @return The list of {@link AccessibilityTarget}.
*/
static List<AccessibilityTarget> getInstalledTargets(Context context,
@ShortcutType int shortcutType) {
final List<AccessibilityTarget> targets = new ArrayList<>();
@@ -110,9 +152,10 @@ final class AccessibilityTargetHelper {
private static List<AccessibilityTarget> getAccessibilityServiceTargets(Context context,
@ShortcutType int shortcutType) {
final AccessibilityManager ams = context.getSystemService(AccessibilityManager.class);
final AccessibilityManager am = (AccessibilityManager) context.getSystemService(
Context.ACCESSIBILITY_SERVICE);
final List<AccessibilityServiceInfo> installedServices =
ams.getInstalledAccessibilityServiceList();
am.getInstalledAccessibilityServiceList();
if (installedServices == null) {
return Collections.emptyList();
}
@@ -136,9 +179,10 @@ final class AccessibilityTargetHelper {
private static List<AccessibilityTarget> getAccessibilityActivityTargets(Context context,
@ShortcutType int shortcutType) {
final AccessibilityManager ams = context.getSystemService(AccessibilityManager.class);
final AccessibilityManager am = (AccessibilityManager) context.getSystemService(
Context.ACCESSIBILITY_SERVICE);
final List<AccessibilityShortcutInfo> installedServices =
ams.getInstalledAccessibilityShortcutListAsUser(context,
am.getInstalledAccessibilityShortcutListAsUser(context,
ActivityManager.getCurrentUser());
if (installedServices == null) {
return Collections.emptyList();

3
core/java/com/android/internal/accessibility/util/AccessibilityUtils.java
View File

@@ -142,7 +142,8 @@ public final class AccessibilityUtils {
*/
public static boolean isAccessibilityServiceEnabled(Context context,
@NonNull String componentId) {
final AccessibilityManager am = context.getSystemService(AccessibilityManager.class);
final AccessibilityManager am = (AccessibilityManager) context.getSystemService(
Context.ACCESSIBILITY_SERVICE);
final List<AccessibilityServiceInfo> enabledServices =
am.getEnabledAccessibilityServiceList(AccessibilityServiceInfo.FEEDBACK_ALL_MASK);

3
core/java/com/android/internal/accessibility/util/ShortcutUtils.java
View File

@@ -137,7 +137,8 @@ public final class ShortcutUtils {
*/
public static boolean isShortcutContained(Context context, @ShortcutType int shortcutType,
@NonNull String componentId) {
final AccessibilityManager am = context.getSystemService(AccessibilityManager.class);
final AccessibilityManager am = (AccessibilityManager) context.getSystemService(
Context.ACCESSIBILITY_SERVICE);
final List<String> requiredTargets = am.getAccessibilityShortcutTargets(shortcutType);
return requiredTargets.contains(componentId);
}

6
core/res/res/values/strings.xml
View File

@@ -4390,12 +4390,6 @@
<!-- Used in multiple service warning to list current features. [CHAR LIMIT=none] -->
<string name="accessibility_shortcut_multiple_service_list">\t• <xliff:g id="service" example="TalkBack">%1$s</xliff:g>\n</string>
<!-- Dialog title for dialog shown when the TalkBack shortcut is activated, and we want to confirm that the user understands what's going to happen. [CHAR LIMIT=none] -->
<string name="accessibility_shortcut_talkback_warning_title">Turn on TalkBack?</string>
<!-- Message shown in dialog when user is in the process of enabling the TalkBack via the volume buttons shortcut for the first time. [CHAR LIMIT=none] -->
<string name="accessibility_shortcut_talkback_warning">Holding down both volume keys for a few seconds turns on TalkBack, a screen reader that is helpful for people who are blind or have low vision. TalkBack completely changes how your device works.\n\nYou can change this shortcut to another feature in Settings > Accessibility.</string>
<!-- Dialog title for dialog shown when this accessibility shortcut is activated, and we want to confirm that the user understands what's going to happen. [CHAR LIMIT=none] -->
<string name="accessibility_shortcut_single_service_warning_title">Turn on <xliff:g id="service" example="TalkBack">%1$s</xliff:g>?</string>

11
core/res/res/values/symbols.xml
View File

@@ -3221,12 +3221,15 @@
<java-symbol type="integer" name="config_debugSystemServerPssThresholdBytes" />
<!-- Accessibility Shortcut -->
<java-symbol type="string" name="accessibility_shortcut_warning_dialog_title" />
<java-symbol type="string" name="accessibility_shortcut_toogle_warning" />
<java-symbol type="string" name="accessibility_shortcut_single_service_warning_title" />
<java-symbol type="string" name="accessibility_shortcut_single_service_warning" />
<java-symbol type="string" name="accessibility_shortcut_multiple_service_warning_title" />
<java-symbol type="string" name="accessibility_shortcut_multiple_service_warning" />
<java-symbol type="string" name="accessibility_shortcut_multiple_service_list" />
<java-symbol type="string" name="accessibility_shortcut_on" />
<java-symbol type="string" name="accessibility_shortcut_off" />
<java-symbol type="string" name="accessibility_shortcut_enabling_service" />
<java-symbol type="string" name="accessibility_shortcut_disabling_service" />
<java-symbol type="string" name="disable_accessibility_shortcut" />
<java-symbol type="string" name="leave_accessibility_shortcut_on" />
<java-symbol type="string" name="color_inversion_feature_name" />
<java-symbol type="string" name="color_correction_feature_name" />
<java-symbol type="string" name="config_defaultAccessibilityService" />

28
core/tests/coretests/src/com/android/internal/accessibility/AccessibilityShortcutControllerTest.java
View File

@@ -93,6 +93,7 @@ import java.util.Set;
@RunWith(AndroidJUnit4.class)
public class AccessibilityShortcutControllerTest {
private static final String SERVICE_NAME_STRING = "fake.package/fake.service.name";
private static final CharSequence PACKAGE_NAME_STRING = "Service name";
private static final String SERVICE_NAME_SUMMARY = "Summary";
private static final long VIBRATOR_PATTERN_1 = 100L;
private static final long VIBRATOR_PATTERN_2 = 150L;
@@ -150,6 +151,8 @@ public class AccessibilityShortcutControllerTest {
new AccessibilityManager(mHandler, mAccessibilityManagerService, 0);
when(mFrameworkObjectProvider.getAccessibilityManagerInstance(mContext))
.thenReturn(accessibilityManager);
when(mContext.getSystemService(Context.ACCESSIBILITY_SERVICE))
.thenReturn(accessibilityManager);
when(mFrameworkObjectProvider.getAlertDialogBuilder(mContext))
.thenReturn(mAlertDialogBuilder);
when(mFrameworkObjectProvider.makeToastFromText(eq(mContext), anyObject(), anyInt()))
@@ -166,13 +169,13 @@ public class AccessibilityShortcutControllerTest {
ResolveInfo resolveInfo = mock(ResolveInfo.class);
resolveInfo.serviceInfo = mock(ServiceInfo.class);
resolveInfo.serviceInfo.applicationInfo = mApplicationInfo;
when(resolveInfo.loadLabel(anyObject())).thenReturn("Service name");
when(resolveInfo.loadLabel(anyObject())).thenReturn(PACKAGE_NAME_STRING);
when(mServiceInfo.getResolveInfo()).thenReturn(resolveInfo);
when(mServiceInfo.getComponentName())
.thenReturn(ComponentName.unflattenFromString(SERVICE_NAME_STRING));
when(mServiceInfo.loadSummary(any())).thenReturn(SERVICE_NAME_SUMMARY);
when(mAlertDialogBuilder.setTitle(anyInt())).thenReturn(mAlertDialogBuilder);
when(mAlertDialogBuilder.setTitle(anyObject())).thenReturn(mAlertDialogBuilder);
when(mAlertDialogBuilder.setCancelable(anyBoolean())).thenReturn(mAlertDialogBuilder);
when(mAlertDialogBuilder.setMessage(anyObject())).thenReturn(mAlertDialogBuilder);
when(mAlertDialogBuilder.setPositiveButton(anyInt(), anyObject()))
@@ -324,7 +327,8 @@ public class AccessibilityShortcutControllerTest {
assertEquals(1, Settings.Secure.getInt(
mContentResolver, ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, 0));
verify(mResources).getString(R.string.accessibility_shortcut_toogle_warning);
verify(mResources).getString(
R.string.accessibility_shortcut_single_service_warning_title, PACKAGE_NAME_STRING);
verify(mAlertDialog).show();
verify(mAccessibilityManagerService, atLeastOnce()).getInstalledAccessibilityServiceList(
anyInt());
@@ -376,16 +380,20 @@ public class AccessibilityShortcutControllerTest {
ArgumentCaptor<DialogInterface.OnClickListener> captor =
ArgumentCaptor.forClass(DialogInterface.OnClickListener.class);
verify(mAlertDialogBuilder).setNegativeButton(eq(R.string.disable_accessibility_shortcut),
verify(mAlertDialogBuilder).setPositiveButton(eq(R.string.accessibility_shortcut_off),
captor.capture());
// Call the button callback
captor.getValue().onClick(null, 0);
// Call the button callback, if one exists
if (captor.getValue() != null) {
captor.getValue().onClick(null, 0);
}
assertTrue(TextUtils.isEmpty(
Settings.Secure.getString(mContentResolver, ACCESSIBILITY_SHORTCUT_TARGET_SERVICE)));
assertEquals(0, Settings.Secure.getInt(
mContentResolver, ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN));
}
@Test
public void testClickingLeaveOnButtonInDialog_shouldLeaveShortcutReady() throws Exception {
public void testClickingTurnOnButtonInDialog_shouldLeaveShortcutReady() throws Exception {
configureShortcutEnabled(ENABLED_EXCEPT_LOCK_SCREEN);
configureValidShortcutService();
Settings.Secure.putInt(mContentResolver, ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN, 0);
@@ -393,8 +401,8 @@ public class AccessibilityShortcutControllerTest {
ArgumentCaptor<DialogInterface.OnClickListener> captor =
ArgumentCaptor.forClass(DialogInterface.OnClickListener.class);
verify(mAlertDialogBuilder).setPositiveButton(eq(R.string.leave_accessibility_shortcut_on),
captor.capture());
verify(mAlertDialogBuilder).setNegativeButton(eq(R.string.accessibility_shortcut_on),
captor.capture());
// Call the button callback, if one exists
if (captor.getValue() != null) {
captor.getValue().onClick(null, 0);
@@ -402,7 +410,7 @@ public class AccessibilityShortcutControllerTest {
assertEquals(SERVICE_NAME_STRING,
Settings.Secure.getString(mContentResolver, ACCESSIBILITY_SHORTCUT_TARGET_SERVICE));
assertEquals(1, Settings.Secure.getInt(
mContentResolver, ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN));
mContentResolver, ACCESSIBILITY_SHORTCUT_DIALOG_SHOWN));
}
@Test