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

Commit 21881d09 authored by Mark Renouf's avatar Mark Renouf Committed by Automerger Merge Worker
Browse files

Merge "Restores a capture rate limit for long screenshots" into tm-dev am:... 

Merge "Restores a capture rate limit for long screenshots" into tm-dev am: 82c77bb1 am: 7d1c95a0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17988788



Change-Id: Ie9c1acbbf806cd5f3c77022a4844aebcf1670a6c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8ab6bcb6 7d1c95a0

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

+8 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ public class ScrollCaptureViewSupport<V extends View> implements ScrollCaptureCa 
        ContentResolver contentResolver = context.getContentResolver();

        mPostScrollDelayMillis = Settings.Global.getLong(contentResolver,

                SETTING_CAPTURE_DELAY, SETTING_CAPTURE_DELAY_DEFAULT);

        Log.d(TAG, "screenshot.scroll_capture_delay = " + mPostScrollDelayMillis);

    }



    /** Based on ViewRootImpl#updateColorModeIfNeeded */
@@ -271,6 +272,13 @@ public class ScrollCaptureViewSupport<V extends View> implements ScrollCaptureCa 
        Rect viewCaptureArea = new Rect(scrollResult.availableArea);

        viewCaptureArea.offset(0, -scrollResult.scrollDelta);



        view.postOnAnimationDelayed(

                () -> doCapture(scrollResult, view, viewCaptureArea, onComplete),

                mPostScrollDelayMillis);

    }



    private void doCapture(ScrollResult scrollResult, V view, Rect viewCaptureArea,

            Consumer<Rect> onComplete) {

        int result = mRenderer.renderView(view, viewCaptureArea);

        if (result == HardwareRenderer.SYNC_OK

                || result == HardwareRenderer.SYNC_REDRAW_REQUESTED) {