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

Commit 31b638d4 authored by Justin Ho's avatar Justin Ho Committed by Android (Google) Code Review
Browse files

Merge "Fix 5355659: Change chevron visuals, timing, and animated positioning" into ics-factoryrom

parents 904fb9d7 ce6eb1f5
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ public class MultiWaveView extends View {

    // Tune-able parameters
    private static final int CHEVRON_INCREMENTAL_DELAY = 160;
    private static final int CHEVRON_ANIMATION_DURATION = 650;
    private static final int CHEVRON_ANIMATION_DURATION = 850;
    private static final int RETURN_TO_HOME_DELAY = 1200;
    private static final int RETURN_TO_HOME_DURATION = 300;
    private static final int HIDE_ANIMATION_DELAY = 200;
@@ -297,7 +297,7 @@ public class MultiWaveView extends View {
     */
    private void startChevronAnimation() {
        final float r = mHandleDrawable.getWidth() * 0.4f;
        final float chevronAnimationDistance = mOuterRadius * 0.8f;
        final float chevronAnimationDistance = mOuterRadius * 1.0f;
        final float from[][] = {
                {mWaveCenterX - r, mWaveCenterY},  // left
                {mWaveCenterX + r, mWaveCenterY},  // right
@@ -310,6 +310,8 @@ public class MultiWaveView extends View {
                {mWaveCenterX, mWaveCenterY + chevronAnimationDistance} }; // bottom

        mChevronAnimations.clear();
        final float startScale = 0.5f;
        final float endScale = 2.0f;
        for (int direction = 0; direction < 4; direction++) {
            for (int count = 0; count < mFeedbackCount; count++) {
                int delay = count * CHEVRON_INCREMENTAL_DELAY;
@@ -323,6 +325,8 @@ public class MultiWaveView extends View {
                        "x", new float[] { from[direction][0], to[direction][0] },
                        "y", new float[] { from[direction][1], to[direction][1] },
                        "alpha", new float[] {1.0f, 0.0f},
                        "scaleX", new float[] {startScale, endScale},
                        "scaleY", new float[] {startScale, endScale},
                        "onUpdate", mUpdateListener));
            }
        }
+421 B (1.08 KiB)
Loading image diff...
+518 B (1.16 KiB)
Loading image diff...
+510 B (1.15 KiB)
Loading image diff...
+399 B (1.07 KiB)
Loading image diff...
Loading