summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/DragLayer.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/launcher2/DragLayer.java')
-rw-r--r--src/com/android/launcher2/DragLayer.java11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java
index 0bcd64c41..a30e0912b 100644
--- a/src/com/android/launcher2/DragLayer.java
+++ b/src/com/android/launcher2/DragLayer.java
@@ -698,13 +698,10 @@ public class DragLayer extends FrameLayout implements ViewGroup.OnHierarchyChang
@Override
protected int getChildDrawingOrder(int childCount, int i) {
- // We don't want to prioritize the workspace drawing on top of the other children in
- // landscape for the overscroll event.
- if (LauncherApplication.isScreenLandscape(getContext())) {
- return super.getChildDrawingOrder(childCount, i);
- }
-
- if (mWorkspaceIndex == -1 || mQsbIndex == -1 ||
+ // TODO: We have turned off this custom drawing order because it now effects touch
+ // dispatch order. We need to sort that issue out and then decide how to go about this.
+ if (true || LauncherApplication.isScreenLandscape(getContext()) ||
+ mWorkspaceIndex == -1 || mQsbIndex == -1 ||
mLauncher.getWorkspace().isDrawingBackgroundGradient()) {
return i;
}