summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/AccessibilityInteractionController.java
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2015-04-09 08:23:05 -0700
committerGeorge Mount <mount@google.com>2015-05-07 08:36:28 -0700
commit41725dedc33906aaafee36b2d6523596e2a8a52e (patch)
tree6ee37b110a44efee78e5822ace351cdccdb0e0df /core/java/android/view/AccessibilityInteractionController.java
parent9260cb7ffe0845d229a8cfe948b4ba30fe32127b (diff)
downloadframeworks_base-41725dedc33906aaafee36b2d6523596e2a8a52e.zip
frameworks_base-41725dedc33906aaafee36b2d6523596e2a8a52e.tar.gz
frameworks_base-41725dedc33906aaafee36b2d6523596e2a8a52e.tar.bz2
Disable input during Activity Transition.
Bug 19437530 While the actual Activity Transitions are running, input is stopped, except for the "back" button. Change-Id: I112e6252b9de05ece10a6267681fee5487e5ef6b
Diffstat (limited to 'core/java/android/view/AccessibilityInteractionController.java')
-rw-r--r--core/java/android/view/AccessibilityInteractionController.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/core/java/android/view/AccessibilityInteractionController.java b/core/java/android/view/AccessibilityInteractionController.java
index 68ad782..3781d40 100644
--- a/core/java/android/view/AccessibilityInteractionController.java
+++ b/core/java/android/view/AccessibilityInteractionController.java
@@ -586,7 +586,7 @@ final class AccessibilityInteractionController {
}
}
- private void perfromAccessibilityActionUiThread(Message message) {
+ private void performAccessibilityActionUiThread(Message message) {
final int flags = message.arg1;
final int accessibilityViewId = message.arg2;
@@ -602,7 +602,8 @@ final class AccessibilityInteractionController {
boolean succeeded = false;
try {
- if (mViewRootImpl.mView == null || mViewRootImpl.mAttachInfo == null) {
+ if (mViewRootImpl.mView == null || mViewRootImpl.mAttachInfo == null ||
+ mViewRootImpl.mStopped || mViewRootImpl.mPausedForTransition) {
return;
}
mViewRootImpl.mAttachInfo.mAccessibilityFetchFlags = flags;
@@ -1146,7 +1147,7 @@ final class AccessibilityInteractionController {
findAccessibilityNodeInfoByAccessibilityIdUiThread(message);
} break;
case MSG_PERFORM_ACCESSIBILITY_ACTION: {
- perfromAccessibilityActionUiThread(message);
+ performAccessibilityActionUiThread(message);
} break;
case MSG_FIND_ACCESSIBILITY_NODE_INFOS_BY_VIEW_ID: {
findAccessibilityNodeInfosByViewIdUiThread(message);