Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0d66849 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Enable new ripple" into sc-dev am: 2dc5e2b4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13921422

Change-Id: I3f41efb2f40a64667f2fb2698cfb90407ecd391d
parents 7cf7ebd0 2dc5e2b4

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

+1 −3
Original line number Original line Diff line number Diff line
@@ -48,7 +48,6 @@ 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;
@@ -152,8 +151,7 @@ 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 =

    private static final boolean FORCE_PATTERNED_STYLE = true;

            SystemProperties.getBoolean("persist.material.patternedripple", false);





    private final Rect mTempRect = new Rect();

    private final Rect mTempRect = new Rect();