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

am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev

Browse Source 
* commit '9973643bfc123fcc73803542ef8cb74e243907ce':
  Give accessibility delegate the first pass at handling ACTION_CLICK
This commit is contained in:
Alan Viverette
2014-12-15 17:31:36 +00:00
committed by Android Git Automerger
parent 2311ded6a3 9973643bfc
commit 2f11125a71
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/View.java
View File

@@ -8185,8 +8185,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* @see #performAccessibilityAction(int, Bundle) * @see #performAccessibilityAction(int, Bundle)
* *
* Note: Called from the default {@link AccessibilityDelegate}. * Note: Called from the default {@link AccessibilityDelegate}.
*
* @hide Until we've refactored all accessibility delegation methods.
*/ */
boolean performAccessibilityActionInternal(int action, Bundle arguments) { public boolean performAccessibilityActionInternal(int action, Bundle arguments) {
switch (action) { switch (action) {
case AccessibilityNodeInfo.ACTION_CLICK: { case AccessibilityNodeInfo.ACTION_CLICK: {
if (isClickable()) { if (isClickable()) {

12
core/java/android/widget/TextView.java
View File

@@ -8475,8 +8475,14 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
} }
} }
/**
* Performs an accessibility action after it has been offered to the
* delegate.
*
* @hide
*/
@Override @Override
public boolean performAccessibilityAction(int action, Bundle arguments) { public boolean performAccessibilityActionInternal(int action, Bundle arguments) {
switch (action) { switch (action) {
case AccessibilityNodeInfo.ACTION_CLICK: { case AccessibilityNodeInfo.ACTION_CLICK: {
boolean handled = false; boolean handled = false;
@@ -8557,10 +8563,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
case AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY: case AccessibilityNodeInfo.ACTION_NEXT_AT_MOVEMENT_GRANULARITY:
case AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY: { case AccessibilityNodeInfo.ACTION_PREVIOUS_AT_MOVEMENT_GRANULARITY: {
ensureIterableTextForAccessibilitySelectable(); ensureIterableTextForAccessibilitySelectable();
return super.performAccessibilityAction(action, arguments); return super.performAccessibilityActionInternal(action, arguments);
} }
default: { default: {
return super.performAccessibilityAction(action, arguments); return super.performAccessibilityActionInternal(action, arguments);
} }
} }
} }