diff options
| author | Winson Chung <winsonc@google.com> | 2012-04-27 13:48:05 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2012-04-27 13:48:51 -0700 |
| commit | 360e63fd3e77247002b86da2a77bd8dfe8c8a807 (patch) | |
| tree | 381bfd47ff8348fed4ff3747d6ae25bbb7c8cccd /src/com/android/launcher2/DragController.java | |
| parent | 840ebf6277c8eea38b6a4f03cd8bb4e09bd69c7d (diff) | |
| download | android_packages_apps_Trebuchet-360e63fd3e77247002b86da2a77bd8dfe8c8a807.tar.gz android_packages_apps_Trebuchet-360e63fd3e77247002b86da2a77bd8dfe8c8a807.tar.bz2 android_packages_apps_Trebuchet-360e63fd3e77247002b86da2a77bd8dfe8c8a807.zip | |
Moving side-page indicators to DragLayer to ensure it draws above hotseat gradient. (Bug 5117499)
Change-Id: Id0ab644f6631f4fd6be042b6be36ba8fe58eaae4
Diffstat (limited to 'src/com/android/launcher2/DragController.java')
| -rw-r--r-- | src/com/android/launcher2/DragController.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/com/android/launcher2/DragController.java b/src/com/android/launcher2/DragController.java index c9bebe3c5..d63743fd3 100644 --- a/src/com/android/launcher2/DragController.java +++ b/src/com/android/launcher2/DragController.java @@ -517,6 +517,7 @@ public class DragController { mScrollState = SCROLL_OUTSIDE_ZONE; mScrollRunnable.setDirection(SCROLL_RIGHT); mDragScroller.onExitScrollArea(); + mLauncher.getDragLayer().onExitScrollArea(); } } @@ -561,6 +562,7 @@ public class DragController { if (mScrollState == SCROLL_OUTSIDE_ZONE) { mScrollState = SCROLL_WAITING_IN_ZONE; if (mDragScroller.onEnterScrollArea(x, y, SCROLL_LEFT)) { + mLauncher.getDragLayer().onEnterScrollArea(SCROLL_LEFT); mScrollRunnable.setDirection(SCROLL_LEFT); mHandler.postDelayed(mScrollRunnable, delay); } @@ -569,6 +571,7 @@ public class DragController { if (mScrollState == SCROLL_OUTSIDE_ZONE) { mScrollState = SCROLL_WAITING_IN_ZONE; if (mDragScroller.onEnterScrollArea(x, y, SCROLL_RIGHT)) { + mLauncher.getDragLayer().onEnterScrollArea(SCROLL_RIGHT); mScrollRunnable.setDirection(SCROLL_RIGHT); mHandler.postDelayed(mScrollRunnable, delay); } @@ -831,6 +834,7 @@ public class DragController { mScrollState = SCROLL_OUTSIDE_ZONE; mDistanceSinceScroll = 0; mDragScroller.onExitScrollArea(); + mLauncher.getDragLayer().onExitScrollArea(); if (isDragging()) { // Force an update so that we can requeue the scroller if necessary |