diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-11-06 16:37:34 +0100 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2013-11-07 13:37:50 +0100 |
| commit | 66b7d011636ce930f4cae9500c7634d950415959 (patch) | |
| tree | 871010b14671f24d94c7e657d68163265d8f95b1 /src/com/android/launcher3/SearchDropTargetBar.java | |
| parent | 458a15f732c380dc4ef3b7dbcae2a6a8f5916f09 (diff) | |
| download | android_packages_apps_Trebuchet-66b7d011636ce930f4cae9500c7634d950415959.tar.gz android_packages_apps_Trebuchet-66b7d011636ce930f4cae9500c7634d950415959.tar.bz2 android_packages_apps_Trebuchet-66b7d011636ce930f4cae9500c7634d950415959.zip | |
Revert "Workaround for remove stuck (issue 11080792)"
This reverts commit f72693d907c67a539cdb6643f157fc0ba28c4268.
Diffstat (limited to 'src/com/android/launcher3/SearchDropTargetBar.java')
| -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); } |