commit ae7c6d12840264bad5d31933f743677a73c3f8fb
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 15 16:38:49 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 15 16:38:49 2018 +0000
tree 9f58711bf2f345484ce189369bb89420d26d8bd5
parent 3871e7268607f446ed25bf475d13e230e51c64c3
parent b8ca1aa7eeb15082331bc9eb47c09aacc6f82e5c

Merge "Add hard clip for overscrolled children to not be visible above QSB." into ub-launcher3-edmonton-polish

src/com/android/launcher3/Workspace.java

diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 3188e6e..abba9c4 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -2387,7 +2387,12 @@
 
     private void manageFolderFeedback(CellLayout targetLayout,
             int[] targetCell, float distance, DragObject dragObject) {
-        if (distance > mMaxDistanceForFolderCreation) return;
+        if (distance > mMaxDistanceForFolderCreation) {
+            if (mDragMode != DRAG_MODE_NONE) {
+                setDragMode(DRAG_MODE_NONE);
+            }
+            return;
+        }
 
         final View dragOverView = mDragTargetLayout.getChildAt(mTargetCell[0], mTargetCell[1]);
         ItemInfo info = dragObject.dragInfo;

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index e8797a7..f6f02fe 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -22,7 +22,7 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml
 
-LOCAL_SDK_VERSION := current
+LOCAL_SDK_VERSION := 28
 LOCAL_MIN_SDK_VERSION := 21
 
 LOCAL_PACKAGE_NAME := Launcher3Tests