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

Commit 4f5a6bf9 authored by Miranda Kephart's avatar Miranda Kephart Committed by Android (Google) Code Review
Browse files

Merge "Move screenshot scroll capture code into its own package" into main

parents c38c51b1 45c6753f

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,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
@@ -126,7 +126,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) -> {
@@ -196,7 +196,7 @@ public class ImageExporter { 
     * @param bitmap   the bitmap to export

     * @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) {

        return export(executor, new Task(mResolver, requestId, bitmap, captureTime, mCompressFormat,

                mQuality, /* publish */ true, owner, mFlags,