aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 08:16:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Pull down should work on search box, even if all apps scroll is not at top. b/30295305" into ub-launcher3-calgary

Browse Source
This commit is contained in:
Hyunyoung Song
2016-08-05 21:13:08 +00:00
committed by Android (Google) Code Review
parent 9323bdbb2a 58a9c4b7d2
commit 96c56b3607
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/launcher3/allapps/AllAppsContainerView.java
View File

@@ -259,13 +259,19 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
/**
* Returns whether the view itself will handle the touch event or not.
*/
public boolean shouldContainerScroll(float x, float y) {
public boolean shouldContainerScroll(MotionEvent ev) {
int[] point = new int[2];
point[0] = (int) x;
point[1] = (int) y;
point[0] = (int) ev.getX();
point[1] = (int) ev.getY();
Utilities.mapCoordInSelfToDescendent(mAppsRecyclerView, this, point);
// if the MotionEvent is inside the thumb, container should not be pulled down.
// IF the MotionEvent is inside the search box, and the container keeps on receiving
// touch input, container should move down.
if (mLauncher.getDragLayer().isEventOverView(mSearchContainer, ev)) {
return true;
}
// IF the MotionEvent is inside the thumb, container should not be pulled down.
if (mAppsRecyclerView.getScrollBar().isNearThumb(point[0], point[1])) {
return false;
}