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

Merge "Constant sparkle scale" into sc-dev

Browse Source
This commit is contained in:
Lucas Dupin
2021-05-26 20:17:48 +00:00
committed by Android (Google) Code Review
parent a75009f504 9f6fb354e8
commit a0ec96f10a
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -975,7 +975,7 @@ public class RippleDrawable extends LayerDrawable {
shader.setColor(color, effectColor); shader.setColor(color, effectColor);
shader.setOrigin(cx, cy); shader.setOrigin(cx, cy);
shader.setTouch(x, y); shader.setTouch(x, y);
shader.setResolution(w, h, mState.mDensity); shader.setResolution(w, h);
shader.setNoisePhase(noisePhase); shader.setNoisePhase(noisePhase);
shader.setRadius(radius); shader.setRadius(radius);
shader.setProgress(.0f); shader.setProgress(.0f);

5
graphics/java/android/graphics/drawable/RippleShader.java
View File

@@ -20,7 +20,6 @@ import android.annotation.ColorInt;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.RuntimeShader; import android.graphics.RuntimeShader;
import android.graphics.Shader; import android.graphics.Shader;
import android.util.DisplayMetrics;
final class RippleShader extends RuntimeShader { final class RippleShader extends RuntimeShader {
private static final String SHADER_UNIFORMS = "uniform vec2 in_origin;\n" private static final String SHADER_UNIFORMS = "uniform vec2 in_origin;\n"
@@ -204,8 +203,8 @@ final class RippleShader extends RuntimeShader {
sparkleColor.green(), sparkleColor.blue(), sparkleColor.alpha()}); sparkleColor.green(), sparkleColor.blue(), sparkleColor.alpha()});
} }
public void setResolution(float w, float h, int density) { public void setResolution(float w, float h) {
final float densityScale = density * DisplayMetrics.DENSITY_DEFAULT_SCALE * 0.8f; final float densityScale = 2.1f;
setUniform("in_resolutionScale", new float[] {1f / w, 1f / h}); setUniform("in_resolutionScale", new float[] {1f / w, 1f / h});
setUniform("in_noiseScale", new float[] {densityScale / w, densityScale / h}); setUniform("in_noiseScale", new float[] {densityScale / w, densityScale / h});
} }