Merge "Revert "Workaround for remove stuck (issue 11080792)"" into jb-ub-now-jolly-elf (1beeb0aa) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/SearchDropTargetBar.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -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);
		}