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

Commit 3b913d7a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add nullability to ScrollView#scrollToDescendant."

parents 1dbd55b6 cc879eed

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -56788,7 +56788,7 @@ package android.widget { 
    method public boolean isFillViewport();

    method public boolean isSmoothScrollingEnabled();

    method public boolean pageScroll(int);

    method public void scrollToDescendant(android.view.View);

    method public void scrollToDescendant(@NonNull android.view.View);

    method public void setBottomEdgeEffectColor(@ColorInt int);

    method public void setEdgeEffectColor(@ColorInt int);

    method public void setFillViewport(boolean);

core/java/android/widget/ScrollView.java

+1 −1
Original line number Diff line number Diff line
@@ -1474,7 +1474,7 @@ public class ScrollView extends FrameLayout { 
     *

     * @param child the View to scroll to

     */

    public void scrollToDescendant(View child) {

    public void scrollToDescendant(@NonNull View child) {

        if (!mIsLayoutDirty) {

            child.getDrawingRect(mTempRect);