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

Commit 19c0a163 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "View measurement optimization" into lmp-mr1-dev

parents cc29c5ef 9cefbda1

core/java/android/view/View.java

+10 −5
Original line number Original line Diff line number Diff line
@@ -17418,17 +17418,22 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
        long key = (long) widthMeasureSpec << 32 | (long) heightMeasureSpec & 0xffffffffL;

        long key = (long) widthMeasureSpec << 32 | (long) heightMeasureSpec & 0xffffffffL;

        if (mMeasureCache == null) mMeasureCache = new LongSparseLongArray(2);

        if (mMeasureCache == null) mMeasureCache = new LongSparseLongArray(2);

















        if ((mPrivateFlags & PFLAG_FORCE_LAYOUT) == PFLAG_FORCE_LAYOUT ||







        final boolean forceLayout = (mPrivateFlags & PFLAG_FORCE_LAYOUT) == PFLAG_FORCE_LAYOUT;











                widthMeasureSpec != mOldWidthMeasureSpec ||







        final boolean isExactly = MeasureSpec.getMode(widthMeasureSpec) == MeasureSpec.EXACTLY &&











                heightMeasureSpec != mOldHeightMeasureSpec) {







                MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.EXACTLY;














        final boolean matchingSize = isExactly &&














                getMeasuredWidth() == MeasureSpec.getSize(widthMeasureSpec) &&














                getMeasuredHeight() == MeasureSpec.getSize(heightMeasureSpec);














        if (forceLayout || !matchingSize &&














                (widthMeasureSpec != mOldWidthMeasureSpec ||














                        heightMeasureSpec != mOldHeightMeasureSpec)) {



























            // first clears the measured dimension flag







            // first clears the measured dimension flag











            mPrivateFlags &= ~PFLAG_MEASURED_DIMENSION_SET;







            mPrivateFlags &= ~PFLAG_MEASURED_DIMENSION_SET;



























            resolveRtlPropertiesIfNeeded();







            resolveRtlPropertiesIfNeeded();



























            int cacheIndex = (mPrivateFlags & PFLAG_FORCE_LAYOUT) == PFLAG_FORCE_LAYOUT ? -1 :







            int cacheIndex = forceLayout ? -1 : mMeasureCache.indexOfKey(key);











                    mMeasureCache.indexOfKey(key);














            if (cacheIndex < 0 || sIgnoreMeasureCache) {







            if (cacheIndex < 0 || sIgnoreMeasureCache) {











                // measure ourselves, this should set the measured dimension flag back







                // measure ourselves, this should set the measured dimension flag back











                onMeasure(widthMeasureSpec, heightMeasureSpec);







                onMeasure(widthMeasureSpec, heightMeasureSpec);