Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vadim Tryshev
2021-04-01 02:26:37 +00:00
committed by Android (Google) Code Review
parent 82cb4c5dc4 cd26c64db7
commit f2ab932abf
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/java/android/graphics/drawable/RippleDrawable.java
View File

@@ -48,6 +48,7 @@ import android.graphics.RecordingCanvas;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.Shader; import android.graphics.Shader;
import android.os.Build; import android.os.Build;
import android.os.SystemProperties;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.animation.LinearInterpolator; import android.view.animation.LinearInterpolator;
@@ -151,7 +152,8 @@ public class RippleDrawable extends LayerDrawable {
private static final int MAX_RIPPLES = 10; private static final int MAX_RIPPLES = 10;
private static final LinearInterpolator LINEAR_INTERPOLATOR = new LinearInterpolator(); private static final LinearInterpolator LINEAR_INTERPOLATOR = new LinearInterpolator();
/** Temporary flag for teamfood. **/ /** Temporary flag for teamfood. **/
private static final boolean FORCE_PATTERNED_STYLE = true; private static final boolean FORCE_PATTERNED_STYLE =
SystemProperties.getBoolean("persist.material.patternedripple", false);
private final Rect mTempRect = new Rect(); private final Rect mTempRect = new Rect();