Merge "Resetting taskView alpha to proper value onAnimationEnd" into ub-launcher3-qt-dev (c9e6f236) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -892,7 +892,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
		mRunningTaskTileHidden = isHidden;
		TaskView runningTask = getRunningTaskView();
		if (runningTask != null) {
		runningTask.setAlpha(isHidden ? 0 : mContentAlpha);
		runningTask.setStableAlpha(isHidden ? 0 : mContentAlpha);
		}
		}

		@@ -1294,7 +1294,7 @@ public abstract class RecentsView<T extends BaseActivity> extends PagedView impl
		for (int i = getTaskViewCount() - 1; i >= 0; i--) {
		TaskView child = getTaskViewAt(i);
		if (!mRunningTaskTileHidden \|\| child.getTask().key.id != mRunningTaskId) {
		getChildAt(i).setAlpha(alpha);
		child.setStableAlpha(alpha);
		}
		}
		mClearAllButton.setContentAlpha(mContentAlpha);

+7 −1

Original line number	Diff line number	Diff line
		@@ -163,6 +163,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
		private ObjectAnimator mIconAndDimAnimator;
		private float mIconScaleAnimStartProgress = 0;
		private float mFocusTransitionProgress = 1;
		private float mStableAlpha = 1;

		private boolean mShowScreenshot;

		@@ -469,7 +470,7 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
		setTranslationX(0f);
		setTranslationY(0f);
		setTranslationZ(0);
		setAlpha(1f);
		setAlpha(mStableAlpha);
		setIconScaleAndDim(1);
		}

		@@ -478,6 +479,11 @@ public class TaskView extends FrameLayout implements PageCallbacks, Reusable {
		setFullscreenProgress(0);
		}

		public void setStableAlpha(float parentAlpha) {
		mStableAlpha = parentAlpha;
		setAlpha(mStableAlpha);
		}

		@Override
		public void onRecycle() {
		resetViewTransforms();