diff options
author | Adam Cohen <adamcohen@google.com> | 2012-08-23 12:18:16 -0700 |
---|---|---|
committer | The Android Automerger <android-build@android.com> | 2012-08-23 14:20:10 -0700 |
commit | 7281b79c7fc526dc0afac7f463560eb23e0c3328 (patch) | |
tree | 1791ac6dce7fcd2f02a9f5aed4e930632fc699b2 | |
parent | fa63e43890505fed44a0d99c0bed9b68c47d6eaa (diff) | |
download | android_packages_apps_Trebuchet-7281b79c7fc526dc0afac7f463560eb23e0c3328.tar.gz android_packages_apps_Trebuchet-7281b79c7fc526dc0afac7f463560eb23e0c3328.tar.bz2 android_packages_apps_Trebuchet-7281b79c7fc526dc0afac7f463560eb23e0c3328.zip |
Temporary fix for qsb and hotseat clicking issues
Change-Id: I3fca1e3dada12c8655887c3d7a2200b6fcfac19c
-rw-r--r-- | res/layout-port/launcher.xml | 8 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 8 | ||||
-rw-r--r-- | src/com/android/launcher2/DragLayer.java | 11 |
3 files changed, 12 insertions, 15 deletions
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 743ec517f..a4275010b 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 a9c3c8dc6..9ddb1355c 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 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; } |