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

am f37696b7: am 76a5c86d: Merge "Fix lockscreen wave animation artifacts" into klp-dev

Browse Source 
* commit 'f37696b70cb1219ce0a1a52eae597b8ddfe62a88':
  Fix lockscreen wave animation artifacts
This commit is contained in:
Chet Haase
2013-10-03 16:14:23 -07:00
committed by Android Git Automerger
parent 91aa602187 f37696b70c
commit 74cf145646
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/widget/multiwaveview/GlowPadView.java
View File

@@ -76,7 +76,7 @@ public class GlowPadView extends View {
}
// Tuneable parameters for animation
private static final int WAVE_ANIMATION_DURATION = 1350;
private static final int WAVE_ANIMATION_DURATION = 1000;
private static final int RETURN_TO_HOME_DELAY = 1200;
private static final int RETURN_TO_HOME_DURATION = 200;
private static final int HIDE_ANIMATION_DELAY = 200;

11
core/java/com/android/internal/widget/multiwaveview/PointCloud.java
View File

@@ -45,8 +45,8 @@ public class PointCloud {
public class WaveManager {
private float radius = 50;
private float width = 200.0f; // TODO: Make configurable
private float alpha = 0.0f;
public void setRadius(float r) {
radius = r;
}
@@ -186,13 +186,12 @@ public class PointCloud {
// Compute contribution from Wave
float radius = hypot(point.x, point.y);
float distanceToWaveRing = (radius - waveManager.radius);
float waveAlpha = 0.0f;
if (distanceToWaveRing < waveManager.width * 0.5f && distanceToWaveRing < 0.0f) {
float cosf = FloatMath.cos(PI * 0.25f * distanceToWaveRing / waveManager.width);
waveAlpha = waveManager.alpha * max(0.0f, (float) Math.pow(cosf, 20.0f));
if (radius < waveManager.radius * 2) {
float distanceToWaveRing = (radius - waveManager.radius);
float cosf = FloatMath.cos(PI * 0.5f * distanceToWaveRing / waveManager.radius);
waveAlpha = waveManager.alpha * max(0.0f, (float) Math.pow(cosf, 6.0f));
}
return (int) (max(glowAlpha, waveAlpha) * 255);
}