diff options
author | Tony Wickham <twickham@google.com> | 2019-04-23 11:28:54 -0700 |
---|---|---|
committer | Tony Wickham <twickham@google.com> | 2019-04-23 11:52:50 -0700 |
commit | 12e8a34ef63c4d1fc0697e79c69c1668b0cf7f11 (patch) | |
tree | d58657dfc94acf5c4cdb693ad7e51ada69697e5c /src/com/android/launcher3/dragndrop/DragLayer.java | |
parent | c06e151e0fd7d1a968fed283c2db5f9873dbb80c (diff) | |
download | packages_apps_Trebuchet-12e8a34ef63c4d1fc0697e79c69c1668b0cf7f11.tar.gz packages_apps_Trebuchet-12e8a34ef63c4d1fc0697e79c69c1668b0cf7f11.tar.bz2 packages_apps_Trebuchet-12e8a34ef63c4d1fc0697e79c69c1668b0cf7f11.zip |
Move system gesture exclusion rect to LauncherRootView
We translate DragLayer when going to -1, so the exclusion rect was off
screen when you went back from there.
Bug: 129297464
Change-Id: Ie079b2dadaca07886408ee9c1d130d7ac351a61d
Diffstat (limited to 'src/com/android/launcher3/dragndrop/DragLayer.java')
-rw-r--r-- | src/com/android/launcher3/dragndrop/DragLayer.java | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index 6cc49de67..9f902ed1b 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -24,12 +24,10 @@ import android.animation.AnimatorListenerAdapter; import android.animation.TimeInterpolator; import android.animation.ValueAnimator; import android.animation.ValueAnimator.AnimatorUpdateListener; -import android.annotation.TargetApi; import android.content.Context; import android.content.res.Resources; import android.graphics.Canvas; import android.graphics.Rect; -import android.os.Build; import android.util.AttributeSet; import android.view.KeyEvent; import android.view.MotionEvent; @@ -45,7 +43,6 @@ import com.android.launcher3.DropTargetBar; import com.android.launcher3.Launcher; import com.android.launcher3.R; import com.android.launcher3.ShortcutAndWidgetContainer; -import com.android.launcher3.Utilities; import com.android.launcher3.Workspace; import com.android.launcher3.anim.Interpolators; import com.android.launcher3.folder.Folder; @@ -57,8 +54,6 @@ import com.android.launcher3.util.Thunk; import com.android.launcher3.views.BaseDragLayer; import java.util.ArrayList; -import java.util.Collections; -import java.util.List; /** * A ViewGroup that coordinates dragging across its descendants @@ -73,9 +68,6 @@ public class DragLayer extends BaseDragLayer<Launcher> { public static final int ANIMATION_END_DISAPPEAR = 0; public static final int ANIMATION_END_REMAIN_VISIBLE = 2; - private static final List<Rect> SYSTEM_GESTURE_EXCLUSION_RECT = - Collections.singletonList(new Rect()); - @Thunk DragController mDragController; // Variables relating to animation of views after drop @@ -94,8 +86,6 @@ public class DragLayer extends BaseDragLayer<Launcher> { private final ViewGroupFocusHelper mFocusIndicatorHelper; private final WorkspaceAndHotseatScrim mScrim; - private boolean mDisallowBackGesture; - /** * Used to create a new DragLayer from XML. * @@ -562,24 +552,6 @@ public class DragLayer extends BaseDragLayer<Launcher> { mScrim.onInsetsChanged(insets); } - @Override - protected void onLayout(boolean changed, int l, int t, int r, int b) { - super.onLayout(changed, l, t, r, b); - SYSTEM_GESTURE_EXCLUSION_RECT.get(0).set(l, t, r, b); - setDisallowBackGesture(mDisallowBackGesture); - } - - @TargetApi(Build.VERSION_CODES.Q) - public void setDisallowBackGesture(boolean disallowBackGesture) { - if (!Utilities.ATLEAST_Q) { - return; - } - mDisallowBackGesture = disallowBackGesture; - setSystemGestureExclusionRects(mDisallowBackGesture - ? SYSTEM_GESTURE_EXCLUSION_RECT - : Collections.emptyList()); - } - public WorkspaceAndHotseatScrim getScrim() { return mScrim; } |