Merge "Remove unused animation of splitInstructionsView text" into main (717c4f51) · Commits · e / os / BlissLauncher3

quickstep/src/com/android/quickstep/util/SplitAnimationController.kt

+0 −4

Original line number	Diff line number	Diff line
		@@ -257,10 +257,6 @@ class SplitAnimationController(val splitSelectStateController: SplitSelectStateC
		Interpolators.clampToProgress(Interpolators.LINEAR,
		timings.instructionsContainerFadeInStartOffset,
		timings.instructionsContainerFadeInEndOffset))
		anim.setViewAlpha(splitInstructionsView!!.textView, 1f,
		Interpolators.clampToProgress(Interpolators.LINEAR,
		timings.instructionsTextFadeInStartOffset,
		timings.instructionsTextFadeInEndOffset))
		anim.addFloat(splitInstructionsView, SplitInstructionsView.UNFOLD, 0.1f, 1f,
		Interpolators.clampToProgress(Interpolators.EMPHASIZED_DECELERATE,
		timings.instructionsUnfoldStartOffset,

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -3298,9 +3298,6 @@ public abstract class RecentsView<ACTIVITY_TYPE extends StatefulActivity<STATE_T
		anim.setViewAlpha(splitInstructionsView, 1, clampToProgress(LINEAR,
		timings.getInstructionsContainerFadeInStartOffset(),
		timings.getInstructionsContainerFadeInEndOffset()));
		anim.setViewAlpha(splitInstructionsView.getTextView(), 1, clampToProgress(LINEAR,
		timings.getInstructionsTextFadeInStartOffset(),
		timings.getInstructionsTextFadeInEndOffset()));
		anim.addFloat(splitInstructionsView, splitInstructionsView.UNFOLD, 0.1f, 1,
		clampToProgress(EMPHASIZED_DECELERATE,
		timings.getInstructionsUnfoldStartOffset(),

quickstep/src/com/android/quickstep/views/SplitInstructionsView.java

+5 −13

Original line number	Diff line number	Diff line
		@@ -23,9 +23,9 @@ import android.util.FloatProperty;
		import android.view.ViewGroup;
		import android.view.accessibility.AccessibilityNodeInfo;
		import android.widget.LinearLayout;
		import android.widget.TextView;

		import androidx.annotation.Nullable;
		import androidx.appcompat.widget.AppCompatTextView;

		import com.android.launcher3.LauncherState;
		import com.android.launcher3.R;
		@@ -41,12 +41,9 @@ import com.android.launcher3.statemanager.StatefulActivity;
		*/
		public class SplitInstructionsView extends LinearLayout {
		private final StatefulActivity mLauncher;
		private AppCompatTextView mInstructionTextView;
		/** Only used if {@link com.android.wm.shell.FeatureFlags#enableSplitContextual()} is true. */
		private AppCompatTextView mCancelTextView;

		public static final FloatProperty<SplitInstructionsView> UNFOLD =
		new FloatProperty<SplitInstructionsView>("SplitInstructionsUnfold") {
		new FloatProperty<>("SplitInstructionsUnfold") {
		@Override
		public void setValue(SplitInstructionsView splitInstructionsView, float v) {
		splitInstructionsView.setScaleY(v);
		@@ -97,12 +94,11 @@ public class SplitInstructionsView extends LinearLayout {
		}

		private void init() {
		mInstructionTextView = findViewById(R.id.split_instructions_text);
		mCancelTextView = findViewById(R.id.split_instructions_text_cancel);
		TextView cancelTextView = findViewById(R.id.split_instructions_text_cancel);

		if (FeatureFlags.enableSplitContextually()) {
		mCancelTextView.setVisibility(VISIBLE);
		mCancelTextView.setOnClickListener((v) -> exitSplitSelection());
		cancelTextView.setVisibility(VISIBLE);
		cancelTextView.setOnClickListener((v) -> exitSplitSelection());
		}
		}

		@@ -147,8 +143,4 @@ public class SplitInstructionsView extends LinearLayout {
		getMeasuredWidth()
		);
		}

		public AppCompatTextView getTextView() {
		return mInstructionTextView;
		}
		}