Merge "Fixing hotseat gradient and removing landscape cling with new xlarge layout." into jb-mr1-dev
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 743ec51..a427501 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -63,16 +63,16 @@
<include android:id="@+id/cell5" layout="@layout/workspace_screen" />
</com.android.launcher2.Workspace>
- <include
- android:id="@+id/qsb_bar"
- layout="@layout/qsb_bar" />
-
<include layout="@layout/hotseat"
android:id="@+id/hotseat"
android:layout_width="match_parent"
android:layout_height="@dimen/button_bar_height_plus_padding"
android:layout_gravity="bottom" />
+ <include
+ android:id="@+id/qsb_bar"
+ layout="@layout/qsb_bar" />
+
<com.android.launcher2.DrawableStateProxyView
android:id="@+id/voice_button_proxy"
android:layout_width="80dp"
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index a9c3c8d..9ddb135 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -63,16 +63,16 @@
<include android:id="@+id/cell5" layout="@layout/workspace_screen" />
</com.android.launcher2.Workspace>
- <include
- android:id="@+id/qsb_bar"
- layout="@layout/qsb_bar" />
-
<include layout="@layout/hotseat"
android:id="@+id/hotseat"
android:layout_width="match_parent"
android:layout_height="@dimen/button_bar_height_plus_padding"
android:layout_gravity="bottom" />
+ <include
+ android:id="@+id/qsb_bar"
+ layout="@layout/qsb_bar" />
+
<com.android.launcher2.DrawableStateProxyView
android:id="@+id/voice_button_proxy"
android:layout_width="80dp"
diff --git a/src/com/android/launcher2/DragLayer.java b/src/com/android/launcher2/DragLayer.java
index 0bcd64c..a30e091 100644
--- a/src/com/android/launcher2/DragLayer.java
+++ b/src/com/android/launcher2/DragLayer.java
@@ -698,13 +698,10 @@
@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;
}