summaryrefslogtreecommitdiff
path: root/graphics/java/android
diff options
context:
space:
mode:
author Lucas Dupin <dupin@google.com> 2021-03-25 21:22:01 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2021-03-25 21:22:01 +0000
commit2dc5e2b4f6831ee1dc4b76996dd9d43dabb4444f (patch)
tree21b8d5cad8bc896ce5f124a58febd4dc23b59548 /graphics/java/android
parent02643234068697fe6e352e4ba0db2e92e5fcf7d1 (diff)
parent49a06ae96f17600ec6f686ac08ea3176b28bc1f8 (diff)
Merge "Enable new ripple" into sc-dev
Diffstat (limited to 'graphics/java/android')
-rw-r--r--graphics/java/android/graphics/drawable/RippleDrawable.java4
1 files changed, 1 insertions, 3 deletions
diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java
index 3bd0a43652d2..f28b66d12688 100644
--- a/graphics/java/android/graphics/drawable/RippleDrawable.java
+++ b/graphics/java/android/graphics/drawable/RippleDrawable.java
@@ -48,7 +48,6 @@ import android.graphics.RecordingCanvas;
import android.graphics.Rect;
import android.graphics.Shader;
import android.os.Build;
-import android.os.SystemProperties;
import android.util.AttributeSet;
import android.view.animation.LinearInterpolator;
@@ -152,8 +151,7 @@ public class RippleDrawable extends LayerDrawable {
private static final int MAX_RIPPLES = 10;
private static final LinearInterpolator LINEAR_INTERPOLATOR = new LinearInterpolator();
/** Temporary flag for teamfood. **/
- private static final boolean FORCE_PATTERNED_STYLE =
- SystemProperties.getBoolean("persist.material.patternedripple", false);
+ private static final boolean FORCE_PATTERNED_STYLE = true;
private final Rect mTempRect = new Rect();