From 0207c522472d7252f146f4d39efa456ca5248c6b Mon Sep 17 00:00:00 2001
From: Patrick Dubroy <dubroy@google.com>
Date: Wed, 3 Nov 2010 22:12:02 -0700
Subject: [PATCH] Draw glow along screen edge when dragging in portrait.

---
 res/drawable/page_hover_left.9.png        | Bin 0 -> 413 bytes
 res/drawable/page_hover_right.9.png       | Bin 0 -> 415 bytes
 res/values-xlarge-port/dimens.xml         |   4 +++
 src/com/android/launcher2/CellLayout.java |   4 +++
 src/com/android/launcher2/Workspace.java  |  32 +++++++++++++++++++---
 5 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 res/drawable/page_hover_left.9.png
 create mode 100644 res/drawable/page_hover_right.9.png

diff --git a/res/drawable/page_hover_left.9.png b/res/drawable/page_hover_left.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d5e0c8118cdef5b885a4aebc9caf555b0340e20
GIT binary patch
literal 413
zcmV;O0b>4%P)<h;3K|Lk000e1NJLTq000aC001fo1^@s6hk&}w0004GNkl<Zc-qaC
zNlF7@5QU$K^Nb>jiU=aQ%ptN91VPlpxbP<Kv(cRkM??`#6bFI^(T(6Wp07wZ{H@(d
zDk9iWG<4Tj_39t0fciuHuZKiOXsrPG$a0Z22CGDOh3MKLI=_RdzymQL=iUtPC-g>)
zybwd5ME@(%6F}*}J2Ck|jLCU8gfg={62%*$AW2g(Wb!hzl!^U2V%s3gWb&-0AWIUs
zCTjY*C$MPptR`Cs%aRJ*5*0;16ttq~)72=8)e^}{0+Mqf=t%EXMW2)7gw+zr$|V4O
zJeM8c6Ke;=d@M`#^f3)k<TC><iFHL@u+`cnMs2k!8NjIlPsD~IFUECP;i*8m4xC&O
zn{r-~w3&v0ImbYaSeC5WXJWi5Acw6GP?o`HFMbEG8Bi)ApJ*0;F3G=2?tO6YwEHZz
zb6S1(!F}W0ciP=G+<nR2`P{wL-M!uO!99W8Gp?;c+N$FhC0TL1BA`v500000NkvXX
Hu0mjf@Oru2

literal 0
HcmV?d00001

diff --git a/res/drawable/page_hover_right.9.png b/res/drawable/page_hover_right.9.png
new file mode 100644
index 0000000000000000000000000000000000000000..1545bfefad327c4b5b1b050be1efccc9cc1deed5
GIT binary patch
literal 415
zcmV;Q0bu@#P)<h;3K|Lk000e1NJLTq000aC001fo1^@s6hk&}w0004INkl<Zc-qC4
zTPuW76oy~JIG-Ackd(xwA2D}IDdESs@K4;&4fhTsDKSG1iAmfjf8+J8&uo2s2eUV^
zYqh88eb##S-rrsuXnhdBK1j61qZMJH8SNH%;t$~#(NQOgcSL8N_>*v(=)NZUG65%k
zB)VRS-Unjfi5SYv9v5pKd?8BD#8_r_v*E=0J$_Cs-Vo(9Aj)o@&4y(*@g=cYBX&~(
z%Wexa&t^lyvXbna5sd_3cFenF7g*9fA@P!`>|GG`uRy`sG4F~|RhgEZWr_DSpCkZ9
zQNDYeol|1wida#i1I2M_1>2n}F>Je|DzjR{ssXBSlnU5_oqtuDyCv3|Ks6VTl}SPK
z^1rVC4{LeAJuxCXQw?Il0Tv0s&Op&02b5sr$3S#fE0y<C{s!RRSPI{z;B)XgX|Hc7
z=xg=458gM<|4xT=4e!3xdgt@*twG(}`+W#{fr8$+e;ZK)cmo_da{29Z_(lK#002ov
JPDHLkV1jysyu|<j

literal 0
HcmV?d00001

diff --git a/res/values-xlarge-port/dimens.xml b/res/values-xlarge-port/dimens.xml
index b60635b0d2..baa31aace6 100644
--- a/res/values-xlarge-port/dimens.xml
+++ b/res/values-xlarge-port/dimens.xml
@@ -15,6 +15,10 @@
 -->
 
 <resources>
+    <!-- the area at the edge of the screen that makes the workspace go left
+         or right while you're dragging. -->
+    <dimen name="scroll_zone">40dp</dimen>
+
     <!-- Width/height gap overrides for the workspace -->
     <dimen name="workspace_width_gap">0dp</dimen>
     <dimen name="workspace_height_gap">32dp</dimen>
diff --git a/src/com/android/launcher2/CellLayout.java b/src/com/android/launcher2/CellLayout.java
index 66d5cb500d..11c0c1822d 100644
--- a/src/com/android/launcher2/CellLayout.java
+++ b/src/com/android/launcher2/CellLayout.java
@@ -327,6 +327,10 @@ public class CellLayout extends ViewGroup implements Dimmable {
         }
     }
 
+    public boolean getHover() {
+        return mHover;
+    }
+
     public void drawChildren(Canvas canvas) {
         super.dispatchDraw(canvas);
     }
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 4679c645d8..df3d2de528 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -605,6 +605,30 @@ public class Workspace extends SmoothPagedView
         } else {
             super.dispatchDraw(canvas);
 
+            final int width = getWidth();
+            final int height = getHeight();
+
+            // In portrait orientation, draw the glowing edge when dragging to adjacent screens
+            if (mInScrollArea && (height > width)) {
+                final int pageHeight = getChildAt(0).getHeight();
+
+                // This determines the height of the glowing edge: 90% of the page height
+                final int padding = (int) ((height - pageHeight) * 0.5f + pageHeight * 0.1f);
+
+                final CellLayout leftPage = (CellLayout) getChildAt(mCurrentPage - 1);
+                final CellLayout rightPage = (CellLayout) getChildAt(mCurrentPage + 1);
+
+                if (leftPage != null && leftPage.getHover()) {
+                    final Drawable d = getResources().getDrawable(R.drawable.page_hover_left);
+                    d.setBounds(mScrollX, padding, mScrollX + d.getIntrinsicWidth(), height - padding);
+                    d.draw(canvas);
+                } else if (rightPage != null && rightPage.getHover()) {
+                    final Drawable d = getResources().getDrawable(R.drawable.page_hover_right);
+                    d.setBounds(mScrollX + width - d.getIntrinsicWidth(), padding, mScrollX + width, height - padding);
+                    d.draw(canvas);
+                }
+            }
+
             if (mDropView != null) {
                 // We are animating an item that was just dropped on the home screen.
                 // Render its View in the current animation position.
@@ -1909,11 +1933,11 @@ public class Workspace extends SmoothPagedView
             final int screen = getCurrentPage() + ((direction == DragController.SCROLL_LEFT) ? -1 : 1);
             if (0 <= screen && screen < getChildCount()) {
                 ((CellLayout) getChildAt(screen)).setHover(true);
-            }
 
-            if (mDragTargetLayout != null) {
-                mDragTargetLayout.onDragExit();
-                mDragTargetLayout = null;
+                if (mDragTargetLayout != null) {
+                    mDragTargetLayout.onDragExit();
+                    mDragTargetLayout = null;
+                }
             }
         }
     }