diff --git a/quickstep/src/com/android/quickstep/util/SplitAnimationController.kt b/quickstep/src/com/android/quickstep/util/SplitAnimationController.kt index b7c6bf5cc0..3cf603b79b 100644 --- a/quickstep/src/com/android/quickstep/util/SplitAnimationController.kt +++ b/quickstep/src/com/android/quickstep/util/SplitAnimationController.kt @@ -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, diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 79729999f3..aeb8ebb97f 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -3281,9 +3281,6 @@ public abstract class RecentsView UNFOLD = - new FloatProperty("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; - } }