diff --git a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.kt b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.kt index 04e1905578..b230fa6ed4 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.kt +++ b/quickstep/src/com/android/launcher3/uioverrides/RecentsViewStateController.kt @@ -38,7 +38,6 @@ import com.android.launcher3.states.StateAnimationConfig.ANIM_OVERVIEW_TRANSLATE import com.android.launcher3.states.StateAnimationConfig.SKIP_OVERVIEW import com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE import com.android.quickstep.util.AnimUtils -import com.android.quickstep.views.ClearAllButton import com.android.quickstep.views.RecentsView import com.android.quickstep.views.RecentsView.ADJACENT_PAGE_HORIZONTAL_OFFSET import com.android.quickstep.views.RecentsView.CONTENT_ALPHA @@ -288,8 +287,8 @@ class RecentsViewStateController(private val launcher: QuickstepLauncher) : val clearAllButtonAlpha = if (state.areElementsVisible(launcher, LauncherState.CLEAR_ALL_BUTTON)) 1f else 0f propertySetter.setFloat( - recentsView.clearAllButton, - ClearAllButton.VISIBILITY_ALPHA, + recentsView.clearAllButton.visibilityAlphaProperty, + MULTI_PROPERTY_VALUE, clearAllButtonAlpha, LINEAR, ) diff --git a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java index 537092f8f4..51f2a33529 100644 --- a/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java +++ b/quickstep/src/com/android/quickstep/fallback/FallbackRecentsStateController.java @@ -52,7 +52,6 @@ import com.android.launcher3.anim.PendingAnimation; import com.android.launcher3.anim.PropertySetter; import com.android.launcher3.statemanager.StateManager.StateHandler; import com.android.launcher3.states.StateAnimationConfig; -import com.android.quickstep.views.ClearAllButton; import com.android.quickstep.views.RecentsView; import com.android.quickstep.views.RecentsViewContainer; @@ -98,8 +97,8 @@ public class FallbackRecentsStateController implements StateHandler= 1f + } } - var contentAlpha = 1f + var scrollAlpha set(value) { - field = value - updateAlpha() + clearAllButtonAlpha.get(Alpha.SCROLL.ordinal).value = value } + get() = clearAllButtonAlpha.get(Alpha.SCROLL.ordinal).value - var visibilityAlpha = 1f + var contentAlpha set(value) { - field = value - updateAlpha() + clearAllButtonAlpha.get(Alpha.CONTENT.ordinal).value = value } + get() = clearAllButtonAlpha.get(Alpha.CONTENT.ordinal).value - var dismissAlpha = 1f + @JvmField + val visibilityAlphaProperty: MultiPropertyFactory.MultiProperty = + clearAllButtonAlpha.get(Alpha.VISIBILITY.ordinal) + + var dismissAlpha set(value) { - field = value - updateAlpha() + dismissAlphaProperty.value = value } + get() = dismissAlphaProperty.value + + @JvmField + val dismissAlphaProperty: MultiPropertyFactory.MultiProperty = + clearAllButtonAlpha.get(Alpha.DISMISS.ordinal) var fullscreenProgress = 1f set(value) { @@ -198,12 +217,6 @@ class ClearAllButton @JvmOverloads constructor(context: Context, attrs: Attribut ) } - private fun updateAlpha() { - val alpha = scrollAlpha * contentAlpha * visibilityAlpha * dismissAlpha - this.alpha = alpha - isClickable = alpha >= 1f - } - fun getScrollAdjustment(fullscreenEnabled: Boolean, gridEnabled: Boolean): Float { var scrollAdjustment = 0f if (fullscreenEnabled) { @@ -244,26 +257,4 @@ class ClearAllButton @JvmOverloads constructor(context: Context, attrs: Attribut if (fullscreenProgress > 0) endTranslation else 0f private fun getGridTrans(endTranslation: Float) = if (gridProgress > 0) endTranslation else 0f - - companion object { - @JvmField - val VISIBILITY_ALPHA: FloatProperty = - object : FloatProperty("visibilityAlpha") { - override fun setValue(clearAllButton: ClearAllButton, value: Float) { - clearAllButton.visibilityAlpha = value - } - - override fun get(clearAllButton: ClearAllButton) = clearAllButton.visibilityAlpha - } - - @JvmField - val DISMISS_ALPHA: FloatProperty = - object : FloatProperty("dismissAlpha") { - override fun setValue(clearAllButton: ClearAllButton, value: Float) { - clearAllButton.dismissAlpha = value - } - - override fun get(clearAllButton: ClearAllButton) = clearAllButton.dismissAlpha - } - } } diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 6b91df1b95..983c393256 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java @@ -66,7 +66,6 @@ import static com.android.launcher3.util.SystemUiController.UI_STATE_FULLSCREEN_ import static com.android.quickstep.BaseContainerInterface.getTaskDimension; import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId; import static com.android.quickstep.util.LogUtils.splitFailureMessage; -import static com.android.quickstep.views.ClearAllButton.DISMISS_ALPHA; import static com.android.quickstep.views.OverviewActionsView.HIDDEN_ACTIONS_IN_MENU; import static com.android.quickstep.views.OverviewActionsView.HIDDEN_DESKTOP; import static com.android.quickstep.views.OverviewActionsView.HIDDEN_NON_ZERO_ROTATION; @@ -3962,7 +3961,8 @@ public abstract class RecentsView< // Change alpha of clear all if translating grid to hide it if (isClearAllHidden) { - anim.setFloat(mClearAllButton, DISMISS_ALPHA, 0, LINEAR); + anim.setFloat(mClearAllButton.dismissAlphaProperty, MULTI_PROPERTY_VALUE, 0, + LINEAR); anim.addListener(new AnimatorListenerAdapter() { @Override public void onAnimationEnd(Animator animation) {