Projects >> android-frameworks-base-with-screenshot-tweaks >>07a70ab46738e3ea629bf97fe587c3d7d0b66269

Chunk
Conflicting content
        float radius = hypot(point.x, point.y);
        float distanceToWaveRing = (radius - waveManager.radius);
        float waveAlpha = 0.0f;
<<<<<<< HEAD
        if (distanceToWaveRing < waveManager.width * 0.5f && distanceToWaveRing < 0.0f) {
            float cosf = FloatMath.cos(PI * 0.25f * distanceToWaveRing / waveManager.width);
=======
        if (distanceToWaveRing < waveManager.width * 0.5f) {
            float cosf = FloatMath.cos(PI * 0.5f * distanceToWaveRing / waveManager.width);
>>>>>>> cf327449f4378c0b2eea060e810e98593d33cc9f
            waveAlpha = waveManager.alpha * max(0.0f, (float) Math.pow(cosf, 20.0f));
        }
Solution content
        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));
        }
File
PointCloud.java
Developer's decision
Version 1
Kind of conflict
If statement
Method invocation
Variable