resolved conflicts for f685c7e5 to ub-launcher3-master (1636cddb) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Launcher.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -3760,6 +3760,7 @@ public class Launcher extends Activity
		*
		* Implementation of the method from LauncherModel.Callbacks.
		*/
		@Override
		public void bindItems(final ArrayList<ItemInfo> shortcuts, final int start, final int end,
		final boolean forceAnimateIcons) {
		Runnable r = new Runnable() {

src/com/android/launcher3/LauncherAnimUtils.java

+18 −17

Original line number	Diff line number	Diff line
		@@ -56,6 +56,7 @@ public class LauncherAnimUtils {
		public static void startAnimationAfterNextDraw(final Animator animator, final View view) {
		view.getViewTreeObserver().addOnDrawListener(new ViewTreeObserver.OnDrawListener() {
		private boolean mStarted = false;

		public void onDraw() {
		if (mStarted) return;
		mStarted = true;

src/com/android/launcher3/LauncherStateTransitionAnimation.java

+27 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.animation.AnimatorSet;
		import android.animation.ObjectAnimator;
		import android.animation.PropertyValuesHolder;
		import android.animation.TimeInterpolator;
		import android.animation.ValueAnimator;
		import android.annotation.SuppressLint;
		import android.annotation.TargetApi;
		import android.content.res.Resources;
		@@ -234,6 +235,8 @@ public class LauncherStateTransitionAnimation {
		startWorkspaceSearchBarAnimation(animation, fromWorkspaceState, toWorkspaceState,
		animated ? revealDuration : 0, overlaySearchBarView);

		Animator updateTransitionStepAnim = dispatchOnLauncherTransitionStepAnim(fromView, toView);

		if (animated && initialized) {
		// Setup the reveal view animation
		int width = revealView.getMeasuredWidth();
		@@ -347,11 +350,12 @@ public class LauncherStateTransitionAnimation {
		animation.play(workspaceAnim);
		}

		animation.play(updateTransitionStepAnim);

		// Dispatch the prepare transition signal
		dispatchOnLauncherTransitionPrepare(fromView, animated, false);
		dispatchOnLauncherTransitionPrepare(toView, animated, false);


		final AnimatorSet stateAnimation = animation;
		final Runnable startAnimRunnable = new Runnable() {
		public void run() {
		@@ -406,6 +410,24 @@ public class LauncherStateTransitionAnimation {
		}
		}

		/**
		* Returns an Animator that calls {@link #dispatchOnLauncherTransitionStep(View, float)} on
		* {@param fromView} and {@param toView} as the animation interpolates.
		*
		* This is a bit hacky: we create a dummy ValueAnimator just for the AnimatorUpdateListener.
		*/
		private Animator dispatchOnLauncherTransitionStepAnim(final View fromView, final View toView) {
		ValueAnimator updateAnimator = ValueAnimator.ofFloat(0, 1);
		updateAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
		@Override
		public void onAnimationUpdate(ValueAnimator animation) {
		dispatchOnLauncherTransitionStep(fromView, animation.getAnimatedFraction());
		dispatchOnLauncherTransitionStep(toView, animation.getAnimatedFraction());
		}
		});
		return updateAnimator;
		}

		/**
		* Starts an animation to the workspace from the apps view.
		*/
		@@ -603,12 +625,16 @@ public class LauncherStateTransitionAnimation {
		startWorkspaceSearchBarAnimation(animation, fromWorkspaceState, toWorkspaceState,
		animated ? revealDuration : 0, overlaySearchBarView);

		Animator updateTransitionStepAnim = dispatchOnLauncherTransitionStepAnim(fromView, toView);

		if (animated && initialized) {
		// Play the workspace animation
		if (workspaceAnim != null) {
		animation.play(workspaceAnim);
		}

		animation.play(updateTransitionStepAnim);

		// hideAppsCustomizeHelper is called in some cases when it is already hidden
		// don't perform all these no-op animations. In particularly, this was causing
		// the all-apps button to pop in and out.