Clean up usages of deprecated methods of AccessibilityManagerCompat
Test: None
Change-Id: I38af9ad45e596756b4de63e6a5c8b59b76f227a7
diff --git a/core-ui/java/android/support/v4/widget/ExploreByTouchHelper.java b/core-ui/java/android/support/v4/widget/ExploreByTouchHelper.java
index 780d34e..8a29eff 100644
--- a/core-ui/java/android/support/v4/widget/ExploreByTouchHelper.java
+++ b/core-ui/java/android/support/v4/widget/ExploreByTouchHelper.java
@@ -28,7 +28,6 @@
import android.support.v4.view.ViewCompat.FocusRealDirection;
import android.support.v4.view.ViewParentCompat;
import android.support.v4.view.accessibility.AccessibilityEventCompat;
-import android.support.v4.view.accessibility.AccessibilityManagerCompat;
import android.support.v4.view.accessibility.AccessibilityNodeInfoCompat;
import android.support.v4.view.accessibility.AccessibilityNodeProviderCompat;
import android.support.v4.view.accessibility.AccessibilityRecordCompat;
@@ -177,8 +176,7 @@
* @return Whether the hover event was handled.
*/
public final boolean dispatchHoverEvent(@NonNull MotionEvent event) {
- if (!mManager.isEnabled()
- || !AccessibilityManagerCompat.isTouchExplorationEnabled(mManager)) {
+ if (!mManager.isEnabled() || !mManager.isTouchExplorationEnabled()) {
return false;
}
@@ -650,7 +648,7 @@
*/
private AccessibilityEvent createEventForHost(int eventType) {
final AccessibilityEvent event = AccessibilityEvent.obtain(eventType);
- ViewCompat.onInitializeAccessibilityEvent(mHost, event);
+ mHost.onInitializeAccessibilityEvent(event);
return event;
}
@@ -941,7 +939,7 @@
ViewParent viewParent = mHost.getParent();
while (viewParent instanceof View) {
final View view = (View) viewParent;
- if ((ViewCompat.getAlpha(view) <= 0) || (view.getVisibility() != View.VISIBLE)) {
+ if ((view.getAlpha() <= 0) || (view.getVisibility() != View.VISIBLE)) {
return false;
}
viewParent = view.getParent();
@@ -964,8 +962,7 @@
* @return whether this virtual view actually took accessibility focus
*/
private boolean requestAccessibilityFocus(int virtualViewId) {
- if (!mManager.isEnabled()
- || !AccessibilityManagerCompat.isTouchExplorationEnabled(mManager)) {
+ if (!mManager.isEnabled() || !mManager.isTouchExplorationEnabled()) {
return false;
}
// TODO: Check virtual view visibility.
diff --git a/samples/Support4Demos/src/com/example/android/supportv4/accessibility/AccessibilityManagerSupportActivity.java b/samples/Support4Demos/src/com/example/android/supportv4/accessibility/AccessibilityManagerSupportActivity.java
index 4ffc0ef..061ed21 100644
--- a/samples/Support4Demos/src/com/example/android/supportv4/accessibility/AccessibilityManagerSupportActivity.java
+++ b/samples/Support4Demos/src/com/example/android/supportv4/accessibility/AccessibilityManagerSupportActivity.java
@@ -22,7 +22,6 @@
import android.content.pm.ResolveInfo;
import android.os.Bundle;
import android.support.v4.accessibilityservice.AccessibilityServiceInfoCompat;
-import android.support.v4.view.accessibility.AccessibilityManagerCompat;
import android.view.accessibility.AccessibilityManager;
import android.widget.TextView;
import android.widget.Toast;
@@ -79,20 +78,16 @@
* when the global accessibility state on the device changes.
*/
private void registerAccessibilityStateChangeListener() {
- // The AccessibilityStateChange listener APIs were added in ICS. Therefore to be
- // backwards compatible we use the APIs in the support library. Note that if the
- // platform API version is lower and the called API is not available no listener
- // is added and you will not receive a call of onAccessibilityStateChanged.
- AccessibilityManagerCompat.addAccessibilityStateChangeListener(mAccessibilityManager,
- new AccessibilityManagerCompat.AccessibilityStateChangeListener() {
- @Override
- public void onAccessibilityStateChanged(boolean enabled) {
- Toast.makeText(AccessibilityManagerSupportActivity.this,
- getString(R.string.accessibility_manager_accessibility_state,
- Boolean.toString(enabled)),
- Toast.LENGTH_SHORT).show();
- }
- });
+ mAccessibilityManager.addAccessibilityStateChangeListener(
+ new AccessibilityManager.AccessibilityStateChangeListener() {
+ @Override
+ public void onAccessibilityStateChanged(boolean enabled) {
+ Toast.makeText(AccessibilityManagerSupportActivity.this,
+ getString(R.string.accessibility_manager_accessibility_state,
+ Boolean.toString(enabled)),
+ Toast.LENGTH_SHORT).show();
+ }
+ });
}
/**
@@ -100,13 +95,9 @@
* accessibility services.
*/
private void updateAccessibilityStateView() {
- // The API for getting the enabled accessibility services based on feedback
- // type was added in ICS. Therefore to be backwards compatible we use the
- // APIs in the support library. Note that if the platform API version is lower
- // and the called API is not available an empty list of services is returned.
List<AccessibilityServiceInfo> enabledServices =
- AccessibilityManagerCompat.getEnabledAccessibilityServiceList(mAccessibilityManager,
- AccessibilityServiceInfo.FEEDBACK_SPOKEN);
+ mAccessibilityManager.getEnabledAccessibilityServiceList(
+ AccessibilityServiceInfo.FEEDBACK_SPOKEN);
if (!enabledServices.isEmpty()) {
StringBuilder builder = new StringBuilder();
final int enabledServiceCount = enabledServices.size();
diff --git a/v7/appcompat/src/android/support/v7/widget/TooltipCompatHandler.java b/v7/appcompat/src/android/support/v7/widget/TooltipCompatHandler.java
index 4670534..b7f0c2c 100644
--- a/v7/appcompat/src/android/support/v7/widget/TooltipCompatHandler.java
+++ b/v7/appcompat/src/android/support/v7/widget/TooltipCompatHandler.java
@@ -22,7 +22,6 @@
import android.content.Context;
import android.support.annotation.RestrictTo;
import android.support.v4.view.ViewCompat;
-import android.support.v4.view.accessibility.AccessibilityManagerCompat;
import android.text.TextUtils;
import android.util.Log;
import android.view.MotionEvent;
@@ -116,8 +115,7 @@
}
AccessibilityManager manager = (AccessibilityManager)
mAnchor.getContext().getSystemService(Context.ACCESSIBILITY_SERVICE);
- if (manager.isEnabled()
- && AccessibilityManagerCompat.isTouchExplorationEnabled(manager)) {
+ if (manager.isEnabled() && manager.isTouchExplorationEnabled()) {
return false;
}
switch (event.getAction()) {