From 0f7551341f7504632e4943c66d6a4fd504bf5a0e Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Thu, 13 Sep 2012 16:25:47 -0700 Subject: [PATCH] Revert "Add accessibility scroll actions to TabWidget" This reverts commit 6053088884171f67e2df253576eab116fd05b4fe Change-Id: Ia648d7e3e092c396a038740d708de37fe4169d80 --- core/java/android/widget/TabWidget.java | 37 ------------------------- 1 file changed, 37 deletions(-) diff --git a/core/java/android/widget/TabWidget.java b/core/java/android/widget/TabWidget.java index 037110548caed..6bced1c6977a6 100644 --- a/core/java/android/widget/TabWidget.java +++ b/core/java/android/widget/TabWidget.java @@ -24,7 +24,6 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.os.Build; -import android.os.Bundle; import android.util.AttributeSet; import android.view.View; import android.view.View.OnFocusChangeListener; @@ -435,42 +434,6 @@ public class TabWidget extends LinearLayout implements OnFocusChangeListener { public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) { super.onInitializeAccessibilityNodeInfo(info); info.setClassName(TabWidget.class.getName()); - - final int tabCount = getTabCount(); - - if (tabCount > 1) { - if (mSelectedTab > 0) { - info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD); - info.setScrollable(true); - } - - if (mSelectedTab < (tabCount - 1)) { - info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD); - info.setScrollable(true); - } - } - } - - @Override - public boolean performAccessibilityAction(int action, Bundle arguments) { - final int tabCount = getTabCount(); - - switch (action) { - case AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD: - if ((tabCount > 1) && (mSelectedTab > 0)) { - focusCurrentTab(mSelectedTab - 1); - return true; - } - return false; - case AccessibilityNodeInfo.ACTION_SCROLL_FORWARD: - if ((tabCount > 1) && (mSelectedTab < (tabCount - 1))) { - focusCurrentTab(mSelectedTab + 1); - return true; - } - return false; - } - - return super.performAccessibilityAction(action, arguments); } /**