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

Commit f6859c3d authored by Mindy Pereira's avatar Mindy Pereira
Browse files

DO NOT MERGE Limit the height of the pull glow. 

Event when the user keeps pulling, should NEVER get bigger than
the max height (~2list items tall).
Fixes b/3074337  Overscroll glow can be stretched indefinitely

Change-Id: Ifc30d4c907d432faf9ee10ddc20bcc8f50b21f81
parent 72552887

core/java/android/widget/EdgeGlow.java

+6 −5
Original line number Diff line number Diff line
@@ -145,10 +145,9 @@ public class EdgeGlow { 
        mEdgeScaleY = mEdgeScaleYStart = Math.max(

                HELD_EDGE_SCALE_Y, Math.min(distance * PULL_DISTANCE_EDGE_FACTOR, 1.f));



        mGlowAlpha = mGlowAlphaStart = Math.min(

        mGlowAlpha = mGlowAlphaStart = Math.min(MAX_ALPHA,

                mGlowAlpha +

                (Math.abs(deltaDistance) * PULL_DISTANCE_ALPHA_GLOW_FACTOR),

                MAX_ALPHA);

                (Math.abs(deltaDistance) * PULL_DISTANCE_ALPHA_GLOW_FACTOR));



        float glowChange = Math.abs(deltaDistance);

        if (deltaDistance > 0 && mPullDistance < 0) {
@@ -157,8 +156,10 @@ public class EdgeGlow { 
        if (mPullDistance == 0) {

            mGlowScaleY = 0;

        }

        mGlowScaleY = mGlowScaleYStart = Math.max(

                0, mGlowScaleY + glowChange * PULL_DISTANCE_GLOW_FACTOR);



        // Do not allow glow to get larger than MAX_GLOW_HEIGHT.

        mGlowScaleY = mGlowScaleYStart = Math.min(MAX_GLOW_HEIGHT, Math.max(

                0, mGlowScaleY + glowChange * PULL_DISTANCE_GLOW_FACTOR));



        mEdgeAlphaFinish = mEdgeAlpha;

        mEdgeScaleYFinish = mEdgeScaleY;