| commit | 4abee75b15df223eee4c34080f5e796599efd8a3 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jul 23 22:22:52 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 23 22:22:52 2020 +0000 |
| tree | 8b1057dc413eb91b525872d4a290553a776600bb | |
| parent | 4351264771bc0acc7757da7652746c82ca528261 [diff] | |
| parent | 53bef26eb6f5fd1a0ebeb27fa2415a42fb163600 [diff] |
Merge "Fix the range of click within the scrollbar for thumb to drag." into rvc-qpr-dev
diff --git a/car-ui-lib/src/com/android/car/ui/recyclerview/FastScroller.java b/car-ui-lib/src/com/android/car/ui/recyclerview/FastScroller.java index 9a44110..35b7908 100644 --- a/car-ui-lib/src/com/android/car/ui/recyclerview/FastScroller.java +++ b/car-ui-lib/src/com/android/car/ui/recyclerview/FastScroller.java
@@ -116,12 +116,7 @@ float percentage = ((newDragPos - thumbCenter) / (float) scrollbarLength); int totalPossibleOffset = mRecyclerView.computeVerticalScrollRange() - mRecyclerView.getHeight(); - int scrollingBy = (int) (percentage * totalPossibleOffset); - int absoluteOffset = mRecyclerView.computeVerticalScrollOffset() + scrollingBy; - if (absoluteOffset < 0) { - return 0; - } - return scrollingBy; + return (int) (percentage * totalPossibleOffset); } /**
diff --git a/car-ui-lib/tests/unit/src/com/android/car/ui/recyclerview/CarUiRecyclerViewTest.java b/car-ui-lib/tests/unit/src/com/android/car/ui/recyclerview/CarUiRecyclerViewTest.java index a1a925b..e8c7422 100644 --- a/car-ui-lib/tests/unit/src/com/android/car/ui/recyclerview/CarUiRecyclerViewTest.java +++ b/car-ui-lib/tests/unit/src/com/android/car/ui/recyclerview/CarUiRecyclerViewTest.java
@@ -403,7 +403,7 @@ // scroll to the start onView(withId(R.id.car_ui_scrollbar_track)).perform( - touchDownAndUp(0f, (thumbView.getHeight() / 2f) + 1)); + touchDownAndUp(0f, 1)); onView(withText(adapter.getItemText(0))).check(matches(isDisplayed())); }