aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 15:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Don't let AllAppsTransitionController intercept when a floating view is open." into ub-launcher3-master

Browse Source
This commit is contained in:
Tony Wickham
2016-12-14 05:06:08 +00:00
committed by Android (Google) Code Review
parent 466c4131d8 139a25a7a8
commit d3e02eba13
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -208,11 +208,6 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
return false;
}
// IF a shortcuts container is open, container should not be pulled down.
if (DeepShortcutsContainer.getOpen(mLauncher) != null) {
return false;
}
// IF scroller is at the very top OR there is no scroll bar because there is probably not
// enough items to scroll, THEN it's okay for the container to be pulled down.
if (mAppsRecyclerView.getScrollBar().getThumbOffsetY() <= 0) {

4
src/com/android/launcher3/allapps/AllAppsTransitionController.java
View File

@@ -17,6 +17,7 @@ import android.view.animation.AccelerateInterpolator;
import android.view.animation.DecelerateInterpolator;
import android.view.animation.Interpolator;
import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.DeviceProfile;
import com.android.launcher3.Hotseat;
import com.android.launcher3.Launcher;
@@ -24,6 +25,7 @@ import com.android.launcher3.LauncherAnimUtils;
import com.android.launcher3.R;
import com.android.launcher3.Utilities;
import com.android.launcher3.Workspace;
import com.android.launcher3.shortcuts.DeepShortcutsContainer;
import com.android.launcher3.userevent.nano.LauncherLogProto;
import com.android.launcher3.util.TouchController;
@@ -118,6 +120,8 @@ public class AllAppsTransitionController implements TouchController, VerticalPul
mNoIntercept = true;
} else if (!mLauncher.isAllAppsVisible() && !shouldPossiblyIntercept(ev)) {
mNoIntercept = true;
} else if (AbstractFloatingView.getTopOpenView(mLauncher) != null) {
mNoIntercept = true;
} else {
// Now figure out which direction scroll events the controller will start
// calling the callbacks.