diff options
| author | Winson Chung <winsonc@google.com> | 2015-10-01 19:37:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-01 19:37:04 +0000 |
| commit | b99d74bb0589dcbaf8167af60fd29be0b42f3139 (patch) | |
| tree | 86ca6e7df73885d3931ce5c3bc75c086f4f755f4 | |
| parent | 5a87313591d04cac6525f386509e986f5b6bf446 (diff) | |
| parent | 0e32c14ada3fae610ece912dcfd426a4a397d9ca (diff) | |
| download | android_packages_apps_Trebuchet-b99d74bb0589dcbaf8167af60fd29be0b42f3139.tar.gz android_packages_apps_Trebuchet-b99d74bb0589dcbaf8167af60fd29be0b42f3139.tar.bz2 android_packages_apps_Trebuchet-b99d74bb0589dcbaf8167af60fd29be0b42f3139.zip | |
am 0e32c14a: Merge "Fixing regression in search bar animation." into ub-launcher3-burnaby-polish
* commit '0e32c14ada3fae610ece912dcfd426a4a397d9ca':
Fixing regression in search bar animation.
| -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 877880592..a8445f384 100644 --- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java +++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java @@ -279,7 +279,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); @@ -687,8 +687,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); @@ -825,9 +825,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); } /** |