Merge "[Unfold animation] Update dark vignette interpolator" into tm-qpr-dev am: 2debfc7b72
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20568655 Change-Id: I11840377464301f4ea51b46c1b0caf0c0c5fdcc7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -15,6 +15,7 @@ import android.os.Trace
|
|||||||
import android.util.AttributeSet
|
import android.util.AttributeSet
|
||||||
import android.util.MathUtils.lerp
|
import android.util.MathUtils.lerp
|
||||||
import android.view.View
|
import android.view.View
|
||||||
|
import android.view.animation.PathInterpolator
|
||||||
import com.android.systemui.animation.Interpolators
|
import com.android.systemui.animation.Interpolators
|
||||||
import com.android.systemui.statusbar.LightRevealEffect.Companion.getPercentPastThreshold
|
import com.android.systemui.statusbar.LightRevealEffect.Companion.getPercentPastThreshold
|
||||||
import com.android.systemui.util.getColorWithAlpha
|
import com.android.systemui.util.getColorWithAlpha
|
||||||
@@ -88,10 +89,12 @@ object LiftReveal : LightRevealEffect {
|
|||||||
|
|
||||||
class LinearLightRevealEffect(private val isVertical: Boolean) : LightRevealEffect {
|
class LinearLightRevealEffect(private val isVertical: Boolean) : LightRevealEffect {
|
||||||
|
|
||||||
private val INTERPOLATOR = Interpolators.FAST_OUT_SLOW_IN_REVERSE
|
// Interpolator that reveals >80% of the content at 0.5 progress, makes revealing faster
|
||||||
|
private val interpolator = PathInterpolator(/* controlX1= */ 0.4f, /* controlY1= */ 0f,
|
||||||
|
/* controlX2= */ 0.2f, /* controlY2= */ 1f)
|
||||||
|
|
||||||
override fun setRevealAmountOnScrim(amount: Float, scrim: LightRevealScrim) {
|
override fun setRevealAmountOnScrim(amount: Float, scrim: LightRevealScrim) {
|
||||||
val interpolatedAmount = INTERPOLATOR.getInterpolation(amount)
|
val interpolatedAmount = interpolator.getInterpolation(amount)
|
||||||
|
|
||||||
scrim.interpolatedRevealAmount = interpolatedAmount
|
scrim.interpolatedRevealAmount = interpolatedAmount
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user