diff options
| author | Winson Chung <winsonc@google.com> | 2015-10-01 19:33:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-01 19:33:58 +0000 |
| commit | 0e32c14ada3fae610ece912dcfd426a4a397d9ca (patch) | |
| tree | 0bcc5d1ad5a5928f2236b69116e3d0573b4800b6 | |
| parent | eaaed098a633eb5a5759778d5b015e11373a5e3d (diff) | |
| parent | a2dc7c351d1455f578bf424b13dbf033344799ea (diff) | |
| download | android_packages_apps_Trebuchet-0e32c14ada3fae610ece912dcfd426a4a397d9ca.tar.gz android_packages_apps_Trebuchet-0e32c14ada3fae610ece912dcfd426a4a397d9ca.tar.bz2 android_packages_apps_Trebuchet-0e32c14ada3fae610ece912dcfd426a4a397d9ca.zip | |
Merge "Fixing regression in search bar animation." into ub-launcher3-burnaby-polish
| -rw-r--r-- | src/com/android/launcher3/LauncherStateTransitionAnimation.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/launcher3/LauncherStateTransitionAnimation.java b/src/com/android/launcher3/LauncherStateTransitionAnimation.java index 5b8af9758..47b0a9166 100644 --- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java +++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java @@ -274,7 +274,7 @@ public class LauncherStateTransitionAnimation { if (overlaySearchBarView != null) { overlaySearchBarView.setAlpha(0f); ObjectAnimator searchBarAlpha = ObjectAnimator.ofFloat(overlaySearchBarView, "alpha", 0f, 1f); - searchBarAlpha.setDuration(100); + searchBarAlpha.setDuration(revealDuration / 2); searchBarAlpha.setInterpolator(new AccelerateInterpolator(1.5f)); layerViews.put(overlaySearchBarView, BUILD_AND_SET_LAYER); animation.play(searchBarAlpha); @@ -593,8 +593,8 @@ public class LauncherStateTransitionAnimation { if (overlaySearchBarView != null) { overlaySearchBarView.setAlpha(1f); ObjectAnimator searchAlpha = ObjectAnimator.ofFloat(overlaySearchBarView, "alpha", 1f, 0f); - searchAlpha.setDuration(material ? 100 : 150); - searchAlpha.setInterpolator(decelerateInterpolator); + searchAlpha.setDuration(revealDuration / 2); + searchAlpha.setInterpolator(new AccelerateInterpolator(1.5f)); searchAlpha.setStartDelay(material ? 0 : itemsAlphaStagger + SINGLE_FRAME_DELAY); layerViews.put(overlaySearchBarView, BUILD_AND_SET_LAYER); animation.play(searchAlpha); @@ -730,9 +730,9 @@ public class LauncherStateTransitionAnimation { return; } } - // Fallback to the default search bar animation otherwise - mLauncher.getSearchDropTargetBar().animateToState(toSearchBarState, duration); } + // Fallback to the default search bar animation otherwise + mLauncher.getSearchDropTargetBar().animateToState(toSearchBarState, duration); } /** |