commit bb6f6a52b6d176be253b1514af459a7aa4e998f8
author Winson Chung <winsonc@google.com> Mon Jul 25 17:55:44 2011 -0700
committer Winson Chung <winsonc@google.com> Mon Jul 25 17:56:08 2011 -0700
tree 618e12455a1f0ff24cad1b91ae86c8d5f3371b4e
parent 56901eb57c1f9a94170c892be70bb0f653514ce8

Fixing regression in divider visibility during spring loaded mode. (5076848)

Change-Id: Ib36e78c840cd2192bdc5f30e425f82e160f63189

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 795d5cc..5839d40 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2113,6 +2113,7 @@
                     if (!springLoaded && !LauncherApplication.isScreenLarge()) {
                         // Hide the workspace scrollbar
                         mWorkspace.hideScrollingIndicator(true);
+                        mWorkspace.hideDockDivider(true);
                     }
                 }
             });
@@ -2138,6 +2139,7 @@
                 if (!springLoaded && !LauncherApplication.isScreenLarge()) {
                     // Hide the workspace scrollbar
                     mWorkspace.hideScrollingIndicator(true);
+                    mWorkspace.hideDockDivider(true);
                 }
             }
         }
@@ -2192,6 +2194,12 @@
             }
             alphaAnim.addListener(new AnimatorListenerAdapter() {
                 @Override
+                public void onAnimationStart(android.animation.Animator animation) {
+                    if (!springLoaded) {
+                        mWorkspace.showDockDivider(false);
+                    }
+                }
+                @Override
                 public void onAnimationEnd(Animator animation) {
                     fromView.setVisibility(View.GONE);
                     if (fromView instanceof LauncherTransitionable) {
@@ -2211,6 +2219,7 @@
 
                 if (!springLoaded && !LauncherApplication.isScreenLarge()) {
                     // Flash the workspace scrollbar
+                    mWorkspace.showDockDivider(true);
                     mWorkspace.flashScrollingIndicator();
                 }
             }