commit fb6721da45e7f3fa4df00d6486ee3c53de5d7cf7
author Winson Chung <winsonc@google.com> Thu May 24 02:24:36 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu May 24 02:24:36 2018 +0000
tree 3077b76e0375f5d0d7d81cb8c6b4908c31a01716
parent d5ccb6978dbf458280bbea17af4df655510f68d0
parent ededa9cce28ec47f4b6a392db165044c3189be64

Merge "Initial changes to support full-width quickscrubbing." into ub-launcher3-edmonton

quickstep/src/com/android/quickstep/views/RecentsView.java

diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 4f169fb..2f6ce8a 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -1315,8 +1315,9 @@
         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());
         }
     }

quickstep/src/com/android/quickstep/views/TaskView.java

diff --git a/quickstep/src/com/android/quickstep/views/TaskView.java b/quickstep/src/com/android/quickstep/views/TaskView.java
index 213d9cb..5413a13 100644
--- a/quickstep/src/com/android/quickstep/views/TaskView.java
+++ b/quickstep/src/com/android/quickstep/views/TaskView.java
@@ -325,7 +325,8 @@
 
         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);
     }