Skip to content

Commit 0f75513

Browse files
alanvAndroid (Google) Code Review
authored andcommitted
Revert "Add accessibility scroll actions to TabWidget"
This reverts commit 6053088 Change-Id: Ia648d7e3e092c396a038740d708de37fe4169d80
1 parent ed1395f commit 0f75513

File tree

1 file changed

+0
-37
lines changed

1 file changed

+0
-37
lines changed

core/java/android/widget/TabWidget.java

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import android.graphics.Rect;
2525
import android.graphics.drawable.Drawable;
2626
import android.os.Build;
27-
import android.os.Bundle;
2827
import android.util.AttributeSet;
2928
import android.view.View;
3029
import android.view.View.OnFocusChangeListener;
@@ -435,42 +434,6 @@ public void sendAccessibilityEventUnchecked(AccessibilityEvent event) {
435434
public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
436435
super.onInitializeAccessibilityNodeInfo(info);
437436
info.setClassName(TabWidget.class.getName());
438-
439-
final int tabCount = getTabCount();
440-
441-
if (tabCount > 1) {
442-
if (mSelectedTab > 0) {
443-
info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD);
444-
info.setScrollable(true);
445-
}
446-
447-
if (mSelectedTab < (tabCount - 1)) {
448-
info.addAction(AccessibilityNodeInfo.ACTION_SCROLL_FORWARD);
449-
info.setScrollable(true);
450-
}
451-
}
452-
}
453-
454-
@Override
455-
public boolean performAccessibilityAction(int action, Bundle arguments) {
456-
final int tabCount = getTabCount();
457-
458-
switch (action) {
459-
case AccessibilityNodeInfo.ACTION_SCROLL_BACKWARD:
460-
if ((tabCount > 1) && (mSelectedTab > 0)) {
461-
focusCurrentTab(mSelectedTab - 1);
462-
return true;
463-
}
464-
return false;
465-
case AccessibilityNodeInfo.ACTION_SCROLL_FORWARD:
466-
if ((tabCount > 1) && (mSelectedTab < (tabCount - 1))) {
467-
focusCurrentTab(mSelectedTab + 1);
468-
return true;
469-
}
470-
return false;
471-
}
472-
473-
return super.performAccessibilityAction(action, arguments);
474437
}
475438

476439
/**

0 commit comments

Comments
 (0)