From 7281b79c7fc526dc0afac7f463560eb23e0c3328 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Thu, 23 Aug 2012 12:18:16 -0700
Subject: Temporary fix for qsb and hotseat clicking issues

Change-Id: I3fca1e3dada12c8655887c3d7a2200b6fcfac19c
---
 res/layout-port/launcher.xml             |  8 ++++----
 res/layout-sw720dp/launcher.xml          |  8 ++++----
 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;
         }
-- 
cgit v1.2.3


From 7fe33a39a801e7de7e4ec2414bf91c6b84750692 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Tue, 4 Sep 2012 08:03:42 -0700
Subject: Adding more debug code for dup. ItemInfo bug

Change-Id: I7963a59b54f05e29e485c3dcc5c0e159e36de59d
---
 src/com/android/launcher2/ItemInfo.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/android/launcher2/ItemInfo.java b/src/com/android/launcher2/ItemInfo.java
index f9ae3686e..165c07b91 100644
--- a/src/com/android/launcher2/ItemInfo.java
+++ b/src/com/android/launcher2/ItemInfo.java
@@ -114,6 +114,8 @@ class ItemInfo {
         screen = info.screen;
         itemType = info.itemType;
         container = info.container;
+        // tempdebug:
+        LauncherModel.checkItemInfo(this);
     }
 
     /** Returns the package name that the intent will resolve to, or an empty string if
-- 
cgit v1.2.3


From 9cf962bbfafafc74d6501902b63bce4b191dc45f Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 10 Sep 2012 12:46:30 -0700
Subject: Workaround for generating QSB icon press states. (Bug 7132477)

Change-Id: I7754bbb20572908cd428c12ba84a7b1160063bcb
---
 .../android/launcher2/HolographicViewHelper.java   | 31 +++++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/com/android/launcher2/HolographicViewHelper.java b/src/com/android/launcher2/HolographicViewHelper.java
index fd499082f..0e798da87 100644
--- a/src/com/android/launcher2/HolographicViewHelper.java
+++ b/src/com/android/launcher2/HolographicViewHelper.java
@@ -42,13 +42,15 @@ public class HolographicViewHelper {
     void generatePressedFocusedStates(ImageView v) {
         if (!mStatesUpdated && v != null) {
             mStatesUpdated = true;
+            Bitmap original = createOriginalImage(v, mTempCanvas);
             Bitmap outline = createPressImage(v, mTempCanvas);
-            FastBitmapDrawable d = new FastBitmapDrawable(outline);
+            FastBitmapDrawable originalD = new FastBitmapDrawable(original);
+            FastBitmapDrawable outlineD = new FastBitmapDrawable(outline);
 
             StateListDrawable states = new StateListDrawable();
-            states.addState(new int[] {android.R.attr.state_pressed}, d);
-            states.addState(new int[] {android.R.attr.state_focused}, d);
-            states.addState(new int[] {}, v.getDrawable());
+            states.addState(new int[] {android.R.attr.state_pressed}, outlineD);
+            states.addState(new int[] {android.R.attr.state_focused}, outlineD);
+            states.addState(new int[] {}, originalD);
             v.setImageDrawable(states);
         }
     }
@@ -63,18 +65,33 @@ public class HolographicViewHelper {
         }
     }
 
+    /**
+     * Creates a copy of the original image.
+     */
+    private Bitmap createOriginalImage(ImageView v, Canvas canvas) {
+        final Bitmap b = Bitmap.createBitmap(
+                v.getWidth(), v.getHeight(), Bitmap.Config.ARGB_8888);
+
+        canvas.setBitmap(b);
+        canvas.save();
+            v.draw(canvas);
+        canvas.restore();
+        canvas.setBitmap(null);
+
+        return b;
+    }
+
     /**
      * Creates a new press state image which is the old image with a blue overlay.
      * Responsibility for the bitmap is transferred to the caller.
      */
     private Bitmap createPressImage(ImageView v, Canvas canvas) {
-        final int padding = HolographicOutlineHelper.MAX_OUTER_BLUR_RADIUS;
         final Bitmap b = Bitmap.createBitmap(
-                v.getWidth() + padding, v.getHeight() + padding, Bitmap.Config.ARGB_8888);
+                v.getWidth(), v.getHeight(), Bitmap.Config.ARGB_8888);
 
         canvas.setBitmap(b);
         canvas.save();
-            v.getDrawable().draw(canvas);
+            v.draw(canvas);
         canvas.restore();
         canvas.drawColor(mHighlightColor, PorterDuff.Mode.SRC_IN);
         canvas.setBitmap(null);
-- 
cgit v1.2.3