Removing old focus animation on the header bar. (7b3ccf54) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -658,7 +658,6 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks,
		}

		SystemServicesProxy ssp = Recents.getSystemServices();
		mHeaderView.onTaskViewFocusChanged(isFocused, animated);
		if (isFocused) {
		if (requestViewFocus && !isFocused()) {
		requestFocus();

packages/SystemUI/src/com/android/systemui/recents/views/TaskViewHeader.java

+0 −35

Original line number	Diff line number	Diff line
		@@ -56,8 +56,6 @@ import com.android.systemui.recents.model.Task;
		public class TaskViewHeader extends FrameLayout
		implements View.OnClickListener, View.OnLongClickListener {

		private static final float FOCUS_TRANSLATION_Z = 4f;

		Task mTask;

		// Header views
		@@ -74,7 +72,6 @@ public class TaskViewHeader extends FrameLayout
		Drawable mDarkDismissDrawable;
		RippleDrawable mBackground;
		GradientDrawable mBackgroundColorDrawable;
		ObjectAnimator mFocusAnimator;
		String mDismissContentDescription;

		// Static highlight that we draw at the top of each view
		@@ -248,9 +245,6 @@ public class TaskViewHeader extends FrameLayout
		mApplicationIcon.setImageDrawable(null);
		mApplicationIcon.setOnClickListener(null);
		mMoveTaskButton.setOnClickListener(null);

		// Stop any focus animations
		Utilities.cancelAnimationWithoutCallbacks(mFocusAnimator);
		}

		/** Updates the resize task bar button. */
		@@ -349,35 +343,6 @@ public class TaskViewHeader extends FrameLayout
		mCornerRadius, mCornerRadius, mDimLayerPaint);
		}

		/** Notifies the associated TaskView has been focused. */
		void onTaskViewFocusChanged(boolean focused, boolean animateFocusedState) {
		boolean isRunning = false;
		if (mFocusAnimator != null) {
		isRunning = mFocusAnimator.isRunning();
		}
		Utilities.cancelAnimationWithoutCallbacks(mFocusAnimator);

		if (focused) {
		if (animateFocusedState) {
		// Bump up the translation
		mFocusAnimator = ObjectAnimator.ofFloat(this, "translationZ", FOCUS_TRANSLATION_Z);
		mFocusAnimator.setDuration(200);
		mFocusAnimator.start();
		} else {
		setTranslationZ(FOCUS_TRANSLATION_Z);
		}
		} else {
		if (isRunning) {
		// Restore the translation
		mFocusAnimator = ObjectAnimator.ofFloat(this, "translationZ", 0f);
		mFocusAnimator.setDuration(150);
		mFocusAnimator.start();
		} else {
		setTranslationZ(0f);
		}
		}
		}

		@Override
		public void onClick(View v) {
		if (v == mApplicationIcon) {