diff options
author | Winson Chung <winsonc@google.com> | 2012-01-23 16:14:56 -0800 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2012-01-24 13:19:55 -0800 |
commit | 1afedc379f8271b9bf86a8d887c3c020d5e59214 (patch) | |
tree | f66c79726dcfbf72cd5786fb1f259e0c6c6884cf /src | |
parent | 28c1854896bfd39d850d4ad562361fcc1651516c (diff) | |
download | android_packages_apps_Trebuchet-1afedc379f8271b9bf86a8d887c3c020d5e59214.tar.gz android_packages_apps_Trebuchet-1afedc379f8271b9bf86a8d887c3c020d5e59214.tar.bz2 android_packages_apps_Trebuchet-1afedc379f8271b9bf86a8d887c3c020d5e59214.zip |
Showing page indicator while dragging (Bug: 5117192)
Change-Id: I3c8180b2166f3961fbb9529c5de187b4b7b561cf
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/launcher2/PagedView.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher2/PagedViewWithDraggableItems.java | 8 | ||||
-rw-r--r-- | src/com/android/launcher2/Workspace.java | 14 |
3 files changed, 22 insertions, 2 deletions
diff --git a/src/com/android/launcher2/PagedView.java b/src/com/android/launcher2/PagedView.java index 903169f6f..afee8b076 100644 --- a/src/com/android/launcher2/PagedView.java +++ b/src/com/android/launcher2/PagedView.java @@ -341,12 +341,10 @@ public abstract class PagedView extends ViewGroup { // a method that subclasses can override to add behavior protected void onPageBeginMoving() { - showScrollingIndicator(false); } // a method that subclasses can override to add behavior protected void onPageEndMoving() { - hideScrollingIndicator(false); } /** diff --git a/src/com/android/launcher2/PagedViewWithDraggableItems.java b/src/com/android/launcher2/PagedViewWithDraggableItems.java index 287a06565..a0479707e 100644 --- a/src/com/android/launcher2/PagedViewWithDraggableItems.java +++ b/src/com/android/launcher2/PagedViewWithDraggableItems.java @@ -165,4 +165,12 @@ public abstract class PagedViewWithDraggableItems extends PagedView cancelDragging(); super.onDetachedFromWindow(); } + + /** Show the scrolling indicators when we move the page */ + protected void onPageBeginMoving() { + showScrollingIndicator(false); + } + protected void onPageEndMoving() { + hideScrollingIndicator(false); + } } diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java index 4ecc1a528..c476fd6b3 100644 --- a/src/com/android/launcher2/Workspace.java +++ b/src/com/android/launcher2/Workspace.java @@ -678,6 +678,9 @@ public class Workspace extends SmoothPagedView if (LauncherApplication.isScreenLarge()) { showOutlines(); } + + // Show the scroll indicator as you pan the page + showScrollingIndicator(false); } protected void onPageEndMoving() { @@ -701,6 +704,11 @@ public class Workspace extends SmoothPagedView if (LauncherApplication.isScreenLarge()) { hideOutlines(); } + + // Hide the scroll indicator as you pan the page + if (!mDragController.isDragging()) { + hideScrollingIndicator(false); + } } mOverScrollMaxBackgroundAlpha = 0.0f; mOverScrollPageIndex = -1; @@ -1928,6 +1936,9 @@ public class Workspace extends SmoothPagedView mDragController.startDrag(b, dragLayerX, dragLayerY, source, child.getTag(), DragController.DRAG_ACTION_MOVE, dragVisualizeOffset, dragRect); b.recycle(); + + // Show the scrolling indicator when you pick up an item + showScrollingIndicator(false); } void addApplicationShortcut(ShortcutInfo info, CellLayout target, long container, int screen, @@ -3118,6 +3129,9 @@ public class Workspace extends SmoothPagedView } mDragOutline = null; mDragInfo = null; + + // Hide the scrolling indicator after you pick up an item + hideScrollingIndicator(false); } public boolean isDropEnabled() { |