From 66b7d011636ce930f4cae9500c7634d950415959 Mon Sep 17 00:00:00 2001 From: Michael Jurka Date: Wed, 6 Nov 2013 16:37:34 +0100 Subject: Revert "Workaround for remove stuck (issue 11080792)" This reverts commit f72693d907c67a539cdb6643f157fc0ba28c4268. --- src/com/android/launcher3/SearchDropTargetBar.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/com/android') diff --git a/src/com/android/launcher3/SearchDropTargetBar.java b/src/com/android/launcher3/SearchDropTargetBar.java index 18e7c86ef..435dbda1d 100644 --- a/src/com/android/launcher3/SearchDropTargetBar.java +++ b/src/com/android/launcher3/SearchDropTargetBar.java @@ -71,10 +71,10 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D mDeleteDropTarget.setLauncher(launcher); mQSBSearchBar = launcher.getQsbBar(); if (mEnableDropDownDropTargets) { - mQSBSearchBarAnim = ObjectAnimator.ofFloat(mQSBSearchBar, "translationY", 0f, + mQSBSearchBarAnim = LauncherAnimUtils.ofFloat(mQSBSearchBar, "translationY", 0, -mBarHeight); } else { - mQSBSearchBarAnim = ObjectAnimator.ofFloat(mQSBSearchBar, "alpha", 1f, 0f); + mQSBSearchBarAnim = LauncherAnimUtils.ofFloat(mQSBSearchBar, "alpha", 1f, 0f); } setupAnimation(mQSBSearchBarAnim, mQSBSearchBar); } @@ -117,12 +117,12 @@ public class SearchDropTargetBar extends FrameLayout implements DragController.D DeviceProfile grid = app.getDynamicGrid().getDeviceProfile(); mBarHeight = grid.searchBarSpaceHeightPx; mDropTargetBar.setTranslationY(-mBarHeight); - mDropTargetBarAnim = ObjectAnimator.ofFloat(mDropTargetBar, "translationY", + mDropTargetBarAnim = LauncherAnimUtils.ofFloat(mDropTargetBar, "translationY", -mBarHeight, 0f); } else { mDropTargetBar.setAlpha(0f); - mDropTargetBarAnim = ObjectAnimator.ofFloat(mDropTargetBar, "alpha", 0f, 1f); + mDropTargetBarAnim = LauncherAnimUtils.ofFloat(mDropTargetBar, "alpha", 0f, 1f); } setupAnimation(mDropTargetBarAnim, mDropTargetBar); } -- cgit v1.2.3