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

Commit 2d1acfc9 authored by Christian Robertson's avatar Christian Robertson
Browse files

New, less blue overscroll assets with tuned constants in EdgeEffect class.

Glow absorb animation was very slow with high velocity flings. Clamped the velocity
and adjusted constants for start values and duration of absorb animation.

Change-Id: Id2a87814498e05f5f8ceb942dd1d765874461beb
parent 16e6e203
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ public class EdgeEffect {

    // Minimum velocity that will be absorbed
    private static final int MIN_VELOCITY = 100;
    // Maximum velocity, clamps at this value
    private static final int MAX_VELOCITY = 10000;

    private static final float EPSILON = 0.001f;

@@ -115,7 +117,7 @@ public class EdgeEffect {
    private static final float PULL_DISTANCE_ALPHA_GLOW_FACTOR = 1.1f;

    private static final int VELOCITY_EDGE_FACTOR = 8;
    private static final int VELOCITY_GLOW_FACTOR = 16;
    private static final int VELOCITY_GLOW_FACTOR = 12;

    private int mState = STATE_IDLE;

@@ -283,10 +285,10 @@ public class EdgeEffect {
     */
    public void onAbsorb(int velocity) {
        mState = STATE_ABSORB;
        velocity = Math.max(MIN_VELOCITY, Math.abs(velocity));
        velocity = Math.min(Math.max(MIN_VELOCITY, Math.abs(velocity)), MAX_VELOCITY);

        mStartTime = AnimationUtils.currentAnimationTimeMillis();
        mDuration = 0.1f + (velocity * 0.03f);
        mDuration = 0.15f + (velocity * 0.02f);

        // The edge should always be at least partially visible, regardless
        // of velocity.
@@ -294,7 +296,7 @@ public class EdgeEffect {
        mEdgeScaleY = mEdgeScaleYStart = 0.f;
        // The glow depends more on the velocity, and therefore starts out
        // nearly invisible.
        mGlowAlphaStart = 0.5f;
        mGlowAlphaStart = 0.3f;
        mGlowScaleYStart = 0.f;

        // Factor the velocity by 8. Testing on device shows this works best to
−640 B (705 B)
Loading image diff...
+2.65 KiB (38 KiB)
Loading image diff...
−369 B (534 B)
Loading image diff...
−3.93 KiB (15.7 KiB)
Loading image diff...
Loading