commit fb3e48e50e7545afe1a4acbf63ce32119f7a05a9
author Lucas Dupin <dupin@google.com> Fri Apr 02 00:01:10 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 02 00:01:10 2021 +0000
tree a60ef3a4377d5efa7ab51476a3b9cd083fc20252
parent 8da276ea29113b29890499e972b86fc364babe9d
parent 834aa9c63b2068373151b199548edd0aafe8fa01

Merge "Revert^2 "Enable new ripple"" into sc-dev

graphics/java/android/graphics/drawable/RippleDrawable.java

diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java
index b689770..8b8cbbc 100644
--- a/graphics/java/android/graphics/drawable/RippleDrawable.java
+++ b/graphics/java/android/graphics/drawable/RippleDrawable.java
@@ -48,7 +48,6 @@
 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 @@
     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();