diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-11-07 12:42:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-07 12:42:04 +0000 |
| commit | 1beeb0aac278756aaf29392b84287cfa633ad52e (patch) | |
| tree | 0758713aa451818835c90af12542c592187e4d4e /src/com/android | |
| parent | 19d10a5822e24b775fe8aefb6ccb5e92345cb7f8 (diff) | |
| parent | 66b7d011636ce930f4cae9500c7634d950415959 (diff) | |
| download | android_packages_apps_Trebuchet-1beeb0aac278756aaf29392b84287cfa633ad52e.tar.gz android_packages_apps_Trebuchet-1beeb0aac278756aaf29392b84287cfa633ad52e.tar.bz2 android_packages_apps_Trebuchet-1beeb0aac278756aaf29392b84287cfa633ad52e.zip | |
Merge "Revert "Workaround for remove stuck (issue 11080792)"" into jb-ub-now-jolly-elf
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher3/SearchDropTargetBar.java | 8 |
1 files changed, 4 insertions, 4 deletions
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); } |