summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nick Chameyev <nickchameyev@google.com> 2021-10-28 14:32:10 +0000
committer Nick Chameyev <nickchameyev@google.com> 2021-10-28 14:32:20 +0000
commit3ab0a839770f9b9d882a1e6ad43ad8f83ea865ee (patch)
tree5ac0f5edbc8990374a79f509ca33b37dbd45f172
parenta9efae988effe5d657a81a7f9a88976953e06038 (diff)
Add keep annotations to KeyButtonRipple
Cherry-pick to resolve conflicts between sc-v2<->master Bug: 200103245 Change-Id: Id1a3f5c403361958fe95f8f98b7e8ee6ecdd0873 Test: manual
-rw-r--r--packages/SystemUI/src/com/android/systemui/navigationbar/buttons/KeyButtonRipple.java10
1 files changed, 10 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/navigationbar/buttons/KeyButtonRipple.java b/packages/SystemUI/src/com/android/systemui/navigationbar/buttons/KeyButtonRipple.java
index e3e2367aeef8..00124ac01cc4 100644
--- a/packages/SystemUI/src/com/android/systemui/navigationbar/buttons/KeyButtonRipple.java
+++ b/packages/SystemUI/src/com/android/systemui/navigationbar/buttons/KeyButtonRipple.java
@@ -37,6 +37,8 @@ import android.view.animation.Interpolator;
import com.android.systemui.R;
import com.android.systemui.animation.Interpolators;
+import androidx.annotation.Keep;
+
import java.util.ArrayList;
import java.util.HashSet;
@@ -184,19 +186,27 @@ public class KeyButtonRipple extends Drawable {
}
}
+ /** Gets the glow alpha, used by {@link android.animation.ObjectAnimator} via reflection. */
+ @Keep
public float getGlowAlpha() {
return mGlowAlpha;
}
+ /** Sets the glow alpha, used by {@link android.animation.ObjectAnimator} via reflection. */
+ @Keep
public void setGlowAlpha(float x) {
mGlowAlpha = x;
invalidateSelf();
}
+ /** Gets the glow scale, used by {@link android.animation.ObjectAnimator} via reflection. */
+ @Keep
public float getGlowScale() {
return mGlowScale;
}
+ /** Sets the glow scale, used by {@link android.animation.ObjectAnimator} via reflection. */
+ @Keep
public void setGlowScale(float x) {
mGlowScale = x;
invalidateSelf();