From d5ccb6978dbf458280bbea17af4df655510f68d0 Mon Sep 17 00:00:00 2001 From: Vadim Tryshev Date: Wed, 23 May 2018 18:01:50 -0700 Subject: [PATCH] Reverting task order reported via accessibility. Now tasks go in the natural left-to-right direction. Bug: 72222505 Test: Manual Change-Id: I9e90d0eaaaa3ca0a73b2fe6d20e82689c2b2f376 --- quickstep/src/com/android/quickstep/views/RecentsView.java | 5 +++-- quickstep/src/com/android/quickstep/views/TaskView.java | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 4f169fb472..2f6ce8a3e4 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -1315,8 +1315,9 @@ public abstract class RecentsView extends PagedView impl super.onInitializeAccessibilityEvent(event); if (event.getEventType() == AccessibilityEvent.TYPE_VIEW_SCROLLED) { - event.setFromIndex(getCurrentPage()); - event.setToIndex(getCurrentPage()); + final int visiblePageNumber = getChildCount() - getCurrentPage() - 1; + event.setFromIndex(visiblePageNumber); + event.setToIndex(visiblePageNumber); event.setItemCount(getChildCount()); } } diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java index 213d9cb592..5413a13199 100644 --- a/quickstep/src/com/android/quickstep/views/TaskView.java +++ b/quickstep/src/com/android/quickstep/views/TaskView.java @@ -325,7 +325,8 @@ public class TaskView extends FrameLayout implements TaskCallbacks, PageCallback final AccessibilityNodeInfo.CollectionItemInfo itemInfo = AccessibilityNodeInfo.CollectionItemInfo.obtain( - 0, 1, recentsView.indexOfChild(this), 1, false); + 0, 1, recentsView.getChildCount() - recentsView.indexOfChild(this) - 1, 1, + false); info.setCollectionItemInfo(itemInfo); }