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

Commit 26be805f authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Do not draw the fade areas when it's not necessary."

parents 818505aa dac5f9f3

core/java/android/view/View.java

+4 −4
Original line number Diff line number Diff line
@@ -6848,16 +6848,16 @@ public class View implements Drawable.Callback, KeyEvent.Callback, Accessibility 


        if (verticalEdges) {

            topFadeStrength = Math.max(0.0f, Math.min(1.0f, getTopFadingEdgeStrength()));

            drawTop = topFadeStrength >= 0.0f;

            drawTop = topFadeStrength > 0.0f;

            bottomFadeStrength = Math.max(0.0f, Math.min(1.0f, getBottomFadingEdgeStrength()));

            drawBottom = bottomFadeStrength >= 0.0f;

            drawBottom = bottomFadeStrength > 0.0f;

        }



        if (horizontalEdges) {

            leftFadeStrength = Math.max(0.0f, Math.min(1.0f, getLeftFadingEdgeStrength()));

            drawLeft = leftFadeStrength >= 0.0f;

            drawLeft = leftFadeStrength > 0.0f;

            rightFadeStrength = Math.max(0.0f, Math.min(1.0f, getRightFadingEdgeStrength()));

            drawRight = rightFadeStrength >= 0.0f;

            drawRight = rightFadeStrength > 0.0f;

        }



        saveCount = canvas.getSaveCount();

core/java/android/widget/TextView.java

+4 −2
Original line number Diff line number Diff line
@@ -6790,8 +6790,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 


    @Override

    protected int computeHorizontalScrollRange() {

        if (mLayout != null)

            return mLayout.getWidth();

        if (mLayout != null) {

            return mSingleLine && (mGravity & Gravity.HORIZONTAL_GRAVITY_MASK) == Gravity.LEFT ?

                    (int) mLayout.getLineWidth(0) : mLayout.getWidth();

        }



        return super.computeHorizontalScrollRange();

    }