From cd26c64db73d4f50b13c750a5f844b8171cb118a Mon Sep 17 00:00:00 2001 From: Vadim Tryshev Date: Wed, 31 Mar 2021 20:11:35 +0000 Subject: [PATCH] Revert "Enable new ripple" Revert "Temporarily force test on a device" Revert submission 13921422-enable_next_ripple Reason for revert: The revert fixes the leak b/183950010. Proof: * Running last good build + the CL we are reverting results in the leak. * The revert was tested on Bonito. The result without the revert is failing: https://android-build.googleplex.com/builds/tests/view?invocationId=I95600008189690647&redirect=https%3A%2F%2Fsponge2.corp.google.com%2Fceb67817-a049-41f8-b127-719a8b4fec50&testPackage=com.android.launcher3.ui The result of TOT + revert (https://android-build.googleplex.com/builds/branch-dashboard/git_master?build_id=P21324441) is passing: https://android-build.googleplex.com/builds/forrest/run/L11500000848549427 Reverted Changes: I928ba73c9:Enable new ripple I17393431a:Temporarily force test on a device Change-Id: I865e05c2c569202f6e8ab545936c1b74db6a18f7 Bug: 183950010 Test: presubmit, forrest --- graphics/java/android/graphics/drawable/RippleDrawable.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java index 30d8eeca42a05..d6bbee90d73b0 100644 --- a/graphics/java/android/graphics/drawable/RippleDrawable.java +++ b/graphics/java/android/graphics/drawable/RippleDrawable.java @@ -48,6 +48,7 @@ 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; @@ -151,7 +152,8 @@ 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 = true; + private static final boolean FORCE_PATTERNED_STYLE = + SystemProperties.getBoolean("persist.material.patternedripple", false); private final Rect mTempRect = new Rect();