diff options
| author | Winson Chung <winsonc@google.com> | 2011-07-26 10:39:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-26 10:39:49 -0700 |
| commit | bf361decc703800d7db41ac87d1e3c87011b2c32 (patch) | |
| tree | c78d7d8080936ce993982ab4d3a2ad660e0d123c /src/com/android/launcher2/Launcher.java | |
| parent | dccef8ca10b6e431b5c0ebaa2e11d9a53653ee3a (diff) | |
| parent | bb6f6a52b6d176be253b1514af459a7aa4e998f8 (diff) | |
| download | android_packages_apps_Trebuchet-bf361decc703800d7db41ac87d1e3c87011b2c32.tar.gz android_packages_apps_Trebuchet-bf361decc703800d7db41ac87d1e3c87011b2c32.tar.bz2 android_packages_apps_Trebuchet-bf361decc703800d7db41ac87d1e3c87011b2c32.zip | |
Merge "Fixing regression in divider visibility during spring loaded mode. (5076848)"
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 795d5ccb9..5839d40ec 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2113,6 +2113,7 @@ public final class Launcher extends Activity if (!springLoaded && !LauncherApplication.isScreenLarge()) { // Hide the workspace scrollbar mWorkspace.hideScrollingIndicator(true); + mWorkspace.hideDockDivider(true); } } }); @@ -2138,6 +2139,7 @@ public final class Launcher extends Activity if (!springLoaded && !LauncherApplication.isScreenLarge()) { // Hide the workspace scrollbar mWorkspace.hideScrollingIndicator(true); + mWorkspace.hideDockDivider(true); } } } @@ -2192,6 +2194,12 @@ public final class Launcher extends Activity } 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 @@ public final class Launcher extends Activity if (!springLoaded && !LauncherApplication.isScreenLarge()) { // Flash the workspace scrollbar + mWorkspace.showDockDivider(true); mWorkspace.flashScrollingIndicator(); } } |