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

Commit 986003d4 authored by Romain Guy's avatar Romain Guy Committed by The Android Open Source Project
Browse files

Automated import from //branches/donutburger/...@142790,142790

parent f0138614

core/java/android/view/ViewGroup.java

+4 −4
Original line number Diff line number Diff line
@@ -1407,6 +1407,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
            }

        }



        // Clear the flag as early as possible to allow draw() implementations

        // to call invalidate() successfully when doing animations

        child.mPrivateFlags |= DRAWN;



        if (!concatMatrix && canvas.quickReject(cl, ct, cr, cb, Canvas.EdgeType.BW) &&

                (child.mPrivateFlags & DRAW_ANIMATION) == 0) {

            return more;
@@ -1476,10 +1480,6 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
            }

        }



        // Clear the flag as early as possible to allow draw() implementations

        // to call invalidate() successfully when doing animations

        child.mPrivateFlags |= DRAWN;



        if (hasNoCache) {

            // Fast path for layouts with no backgrounds

            if ((child.mPrivateFlags & SKIP_DRAW) == SKIP_DRAW) {

core/java/android/widget/ListView.java

+1 −0
Original line number Diff line number Diff line
@@ -1060,6 +1060,7 @@ public class ListView extends AbsListView { 
     *         UNSPECIFIED/AT_MOST modes, false otherwise.

     * @hide

     */

    @ViewDebug.ExportedProperty

    protected boolean recycleOnMeasure() {

        return true;

    }

core/java/android/widget/TextView.java

+8 −2
Original line number Diff line number Diff line
@@ -3359,12 +3359,16 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            mPopup.update(this, getErrorX(), getErrorY(), -1, -1);

        }



        restartMarqueeIfNeeded();



        return result;

    }



    private void restartMarqueeIfNeeded() {

        if (mRestartMarquee && mEllipsize == TextUtils.TruncateAt.MARQUEE) {

            mRestartMarquee = false;

            startMarquee();

        }



        return result;

    }



    /**
@@ -3674,6 +3678,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 


    @Override

    protected void onDraw(Canvas canvas) {

        restartMarqueeIfNeeded();



        // Draw the background for this view

        super.onDraw(canvas);