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

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

Merge "Do not scale down sparkles" into sc-dev am: 19f026c2 

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

Change-Id: I4bcfa31f3fcdac0032a0060c11e702c8503b49b1
parents 5c0c4338 19f026c2

graphics/java/android/graphics/drawable/RippleShader.java

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ final class RippleShader extends RuntimeShader { 
            + "  float currentRadius = radius * progress;\n"

            + "  float circle_outer = softCircle(uv, xy, currentRadius + thickness, blur);\n"

            + "  float circle_inner = softCircle(uv, xy, currentRadius - thickness, blur);\n"

            + "  return clamp(circle_outer - circle_inner, 0., 1.);\n"

            + "  return saturate(circle_outer - circle_inner);\n"

            + "}\n"

            + "float subProgress(float start, float end, float progress) {\n"

            + "    float sub = clamp(progress, start, end);\n"
@@ -133,7 +133,7 @@ final class RippleShader extends RuntimeShader { 
    }



    public void setResolution(float w, float h, int density) {

        float densityScale = density * DisplayMetrics.DENSITY_DEFAULT_SCALE * 0.5f;

        float densityScale = density * DisplayMetrics.DENSITY_DEFAULT_SCALE;

        setUniform("in_resolutionScale", new float[] {1f / w, 1f / h});

        setUniform("in_noiseScale", new float[] {densityScale / w, densityScale / h});

    }