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

Merge "Refactor accessibility button support detection" into oc-dev

Browse Source
This commit is contained in:
Casey Burkhardt
2017-05-02 04:05:26 +00:00
committed by Android (Google) Code Review
parent 12c6a04db0 ad217d1f86
commit 337e2aae53
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -50496,6 +50496,7 @@ package android.view.accessibility {
method public java.util.List<android.accessibilityservice.AccessibilityServiceInfo> getEnabledAccessibilityServiceList(int);
method public java.util.List<android.accessibilityservice.AccessibilityServiceInfo> getInstalledAccessibilityServiceList();
method public void interrupt();
method public static boolean isAccessibilityButtonSupported();
method public boolean isEnabled();
method public boolean isTouchExplorationEnabled();
method public boolean removeAccessibilityStateChangeListener(android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener);

15
core/java/android/view/accessibility/AccessibilityManager.java
View File

@@ -23,10 +23,12 @@ import android.accessibilityservice.AccessibilityServiceInfo;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SdkConstant;
import android.annotation.SystemApi;
import android.content.ComponentName;
import android.content.Context;
import android.content.pm.PackageManager;
import android.content.pm.ServiceInfo;
import android.content.res.Resources;
import android.os.Binder;
import android.os.Handler;
import android.os.IBinder;
@@ -1059,6 +1061,19 @@ public final class AccessibilityManager {
}
}
/**
* Determines if the accessibility button within the system navigation area is supported.
*
* @return {@code true} if the accessibility button is supported on this device,
* {@code false} otherwise
* @hide
*/
@SystemApi
public static boolean isAccessibilityButtonSupported() {
final Resources res = Resources.getSystem();
return res.getBoolean(com.android.internal.R.bool.config_showNavigationBar);
}
private final class MyCallback implements Handler.Callback {
public static final int MSG_SET_STATE = 1;

5
packages/SettingsLib/src/com/android/settingslib/accessibility/AccessibilityButtonHelper.java
View File

@@ -18,7 +18,6 @@ package com.android.settingslib.accessibility;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.content.Context;
import android.content.res.Resources;
import android.provider.Settings;
import android.view.accessibility.AccessibilityManager;
@@ -55,8 +54,4 @@ public class AccessibilityButtonHelper {
public static boolean isRequested(Context ctx) {
return isRequestedByMagnification(ctx) || isRequestedByAccessibilityService(ctx);
}
public static boolean isDeviceSupported(Resources res) {
return res.getBoolean(com.android.internal.R.bool.config_showNavigationBar);
}
}