diff options
| author | Adam Cohen <adamcohen@google.com> | 2012-08-23 12:18:16 -0700 |
|---|---|---|
| committer | Adam Cohen <adamcohen@google.com> | 2012-08-23 12:23:26 -0700 |
| commit | e29c55ac322f3386327fa5b61e79b00ba3e5d428 (patch) | |
| tree | 1791ac6dce7fcd2f02a9f5aed4e930632fc699b2 /src/com/android/launcher2 | |
| parent | fa63e43890505fed44a0d99c0bed9b68c47d6eaa (diff) | |
| download | android_packages_apps_Trebuchet-e29c55ac322f3386327fa5b61e79b00ba3e5d428.tar.gz android_packages_apps_Trebuchet-e29c55ac322f3386327fa5b61e79b00ba3e5d428.tar.bz2 android_packages_apps_Trebuchet-e29c55ac322f3386327fa5b61e79b00ba3e5d428.zip | |
Temporary fix for qsb and hotseat clicking issues
Change-Id: I3fca1e3dada12c8655887c3d7a2200b6fcfac19c
Diffstat (limited to 'src/com/android/launcher2')
| -rw-r--r-- | src/com/android/launcher2/DragLayer.java | 11 |
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; } |