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

Commit 87e8b25e authored by Chet Haase's avatar Chet Haase Committed by Android (Google) Code Review
Browse files

Merge "Remove redundant computeScroll() call for hw-accelerated views"

parents 401b1f85 526057bc

core/java/android/view/View.java

+8 −5
Original line number Diff line number Diff line
@@ -12922,11 +12922,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
            mPrivateFlags &= ~INVALIDATED;

        }













        computeScroll();

























        final int sx = mScrollX;













        final int sy = mScrollY;



























        DisplayList displayList = null;















        Bitmap cache = null;















        boolean hasDisplayList = false;










@@ -12973,6 +12968,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback,













            }















        }



























        int sx = 0;













        int sy = 0;













        if (!hasDisplayList) {













            computeScroll();













            sx = mScrollX;













            sy = mScrollY;













        }



























        final boolean hasNoCache = cache == null || hasDisplayList;















        final boolean offsetForScroll = cache == null && !hasDisplayList &&















                layerType != LAYER_TYPE_HARDWARE;