summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVadim Tryshev <vadimt@google.com>2018-05-23 18:01:50 -0700
committerVadim Tryshev <vadimt@google.com>2018-05-23 18:01:50 -0700
commitd5ccb6978dbf458280bbea17af4df655510f68d0 (patch)
treebac2dc40c0510061136a73964158f1ab97e87607
parent1ab656460b7baf9ac9233eab3e9582abb8d6941c (diff)
downloadandroid_packages_apps_Trebuchet-d5ccb6978dbf458280bbea17af4df655510f68d0.tar.gz
android_packages_apps_Trebuchet-d5ccb6978dbf458280bbea17af4df655510f68d0.tar.bz2
android_packages_apps_Trebuchet-d5ccb6978dbf458280bbea17af4df655510f68d0.zip
Reverting task order reported via accessibility.
Now tasks go in the natural left-to-right direction. Bug: 72222505 Test: Manual Change-Id: I9e90d0eaaaa3ca0a73b2fe6d20e82689c2b2f376
-rw-r--r--quickstep/src/com/android/quickstep/views/RecentsView.java5
-rw-r--r--quickstep/src/com/android/quickstep/views/TaskView.java3
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 4f169fb47..2f6ce8a3e 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<T extends BaseActivity> 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 213d9cb59..5413a1319 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);
}