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

Commit 13a81aad authored by Mindy Pereira's avatar Mindy Pereira Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE Limit the height of the pull glow." into gingerbread

parents 3d265b57 f6859c3d

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;