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

Commit e86123e6 authored by Mark Renouf's avatar Mark Renouf Committed by Android (Google) Code Review
Browse files

Merge "Clean up and expand long screenshots test coverage"

parents b54e8376 1ad52118

core/java/com/android/internal/view/ListViewCaptureHelper.java

+6 −1
Original line number Diff line number Diff line
@@ -38,6 +38,12 @@ public class ListViewCaptureHelper implements ScrollCaptureViewHelper<ListView> 
    private boolean mScrollBarWasEnabled;

    private int mOverScrollMode;



    @Override

    public boolean onAcceptSession(@NonNull ListView view) {

        return view.isVisibleToUser()

                && (view.canScrollVertically(UP) || view.canScrollVertically(DOWN));

    }



    @Override

    public void onPrepareForStart(@NonNull ListView view, Rect scrollBounds) {

        mScrollDelta = 0;
@@ -114,7 +120,6 @@ public class ListViewCaptureHelper implements ScrollCaptureViewHelper<ListView> 
        return result;

    }





    @Override

    public void onPrepareForEnd(@NonNull ListView listView) {

        // Restore original position and state

core/java/com/android/internal/view/RecyclerViewCaptureHelper.java

+6 −0
Original line number Diff line number Diff line
@@ -43,6 +43,12 @@ public class RecyclerViewCaptureHelper implements ScrollCaptureViewHelper<ViewGr 
    private boolean mScrollBarWasEnabled;

    private int mOverScrollMode;



    @Override

    public boolean onAcceptSession(@NonNull ViewGroup view) {

        return view.isVisibleToUser()

                && (view.canScrollVertically(UP) || view.canScrollVertically(DOWN));

    }



    @Override

    public void onPrepareForStart(@NonNull ViewGroup view, Rect scrollBounds) {

        mScrollDelta = 0;

core/java/com/android/internal/view/ScrollCaptureViewHelper.java

+1 −4
Original line number Diff line number Diff line
@@ -67,10 +67,7 @@ public interface ScrollCaptureViewHelper<V extends View> { 
     * @param view the view being captured

     * @return true if the callback should respond to a request with scroll bounds

     */

    default boolean onAcceptSession(@NonNull V view) {

        return view.isVisibleToUser()

                && (view.canScrollVertically(UP) || view.canScrollVertically(DOWN));

    }

    boolean onAcceptSession(@NonNull V view);



    /**

     * Given a scroll capture request for a view, adjust the provided rect to cover the scrollable

core/java/com/android/internal/view/ScrollViewCaptureHelper.java

+5 −0
Original line number Diff line number Diff line
@@ -43,6 +43,11 @@ public class ScrollViewCaptureHelper implements ScrollCaptureViewHelper<ViewGrou 
    private boolean mScrollBarEnabled;

    private int mOverScrollMode;



    public boolean onAcceptSession(@NonNull ViewGroup view) {

        return view.isVisibleToUser()

                && (view.canScrollVertically(UP) || view.canScrollVertically(DOWN));

    }



    public void onPrepareForStart(@NonNull ViewGroup view, Rect scrollBounds) {

        mStartScrollY = view.getScrollY();

        mOverScrollMode = view.getOverScrollMode();

core/java/com/android/internal/view/WebViewCaptureHelper.java

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import android.webkit.WebView; 
/**

 * ScrollCapture for WebView.

 */

class WebViewCaptureHelper implements ScrollCaptureViewHelper<WebView> {

public class WebViewCaptureHelper implements ScrollCaptureViewHelper<WebView> {

    private static final String TAG = "WebViewScrollCapture";



    private final Rect mRequestWebViewLocal = new Rect();