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

Commit 2889e4ba authored by Miranda Kephart's avatar Miranda Kephart Committed by Matt Casey
Browse files

Move screenshot scroll capture code into its own package 

Bug: 328603973
Bug: 329659738
Flag: NONE
Test: manual
Change-Id: If7be9b125cfc17acc34db44f6eda8e09814e9a3a
Merged-In: If7be9b125cfc17acc34db44f6eda8e09814e9a3a
parent bc9d2fb7

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ 
            </intent-filter>

        </receiver>



        <activity android:name=".screenshot.LongScreenshotActivity"

        <activity android:name=".screenshot.scroll.LongScreenshotActivity"

                  android:theme="@style/LongScreenshotActivity"

                  android:process=":screenshot"

                  android:exported="false"

packages/SystemUI/res/layout/app_clips_screenshot.xml

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ 
        tools:minHeight="100dp"

        tools:minWidth="100dp" />



    <com.android.systemui.screenshot.CropView

    <com.android.systemui.screenshot.scroll.CropView

        android:id="@+id/crop_view"

        android:layout_width="0px"

        android:layout_height="0px"

packages/SystemUI/res/layout/long_screenshot.xml

+2 −2
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ 
        app:layout_constraintStart_toStartOf="parent"

        android:transitionName="screenshot_preview_image"/>



    <com.android.systemui.screenshot.CropView

    <com.android.systemui.screenshot.scroll.CropView

        android:id="@+id/crop_view"

        android:layout_width="0px"

        android:layout_height="0px"
@@ -122,7 +122,7 @@ 
        tools:minHeight="100dp"

        tools:minWidth="100dp" />



    <com.android.systemui.screenshot.MagnifierView

    <com.android.systemui.screenshot.scroll.MagnifierView

        android:id="@+id/magnifier"

        android:visibility="invisible"

        android:layout_width="200dp"

packages/SystemUI/src/com/android/systemui/dagger/DefaultActivityBinder.java

+1 −1
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ import com.android.systemui.contrast.ContrastDialogActivity; 
import com.android.systemui.keyguard.WorkLockActivity;

import com.android.systemui.people.PeopleSpaceActivity;

import com.android.systemui.people.widget.LaunchConversationActivity;

import com.android.systemui.screenshot.LongScreenshotActivity;

import com.android.systemui.screenshot.appclips.AppClipsActivity;

import com.android.systemui.screenshot.appclips.AppClipsTrampolineActivity;

import com.android.systemui.screenshot.scroll.LongScreenshotActivity;

import com.android.systemui.sensorprivacy.SensorUseStartedActivity;

import com.android.systemui.settings.brightness.BrightnessDialog;

import com.android.systemui.telephony.ui.activity.SwitchToManagedProfileForCallActivity;

packages/SystemUI/src/com/android/systemui/screenshot/ImageExporter.java

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ public class ImageExporter { 
    /**

     * Writes the given Bitmap to outputFile.

     */

    ListenableFuture<File> exportToRawFile(Executor executor, Bitmap bitmap,

    public ListenableFuture<File> exportToRawFile(Executor executor, Bitmap bitmap,

            final File outputFile) {

        return CallbackToFutureAdapter.getFuture(

                (completer) -> {
@@ -165,7 +165,7 @@ public class ImageExporter { 
     *

     * @return a listenable future result

     */

    ListenableFuture<Result> export(Executor executor, UUID requestId, Bitmap bitmap,

    public ListenableFuture<Result> export(Executor executor, UUID requestId, Bitmap bitmap,

            ZonedDateTime captureTime, UserHandle owner, int displayId) {



        final Task task = new Task(mResolver, requestId, bitmap, captureTime, mCompressFormat,