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

Commit 1723bc64 authored by Matt Casey's avatar Matt Casey Committed by Android (Google) Code Review
Browse files

Merge "Remove all usages of SCREENSHOT_METADATA flag" into main

parents 95a39183 b3ae31a8

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

+0 −12
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import android.app.ActivityOptions; 
import android.app.ExitTransitionCoordinator;

import android.app.ICompatCameraControlCallback;

import android.app.Notification;

import android.app.assist.AssistContent;

import android.content.BroadcastReceiver;

import android.content.Context;

import android.content.Intent;
@@ -85,7 +84,6 @@ import com.android.systemui.broadcast.BroadcastSender; 
import com.android.systemui.clipboardoverlay.ClipboardOverlayController;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.res.R;

import com.android.systemui.screenshot.TakeScreenshotService.RequestCallback;

import com.android.systemui.screenshot.scroll.LongScreenshotActivity;
@@ -442,16 +440,6 @@ public class ScreenshotController { 


        prepareViewForNewScreenshot(screenshot, oldPackageName);



        if (mFlags.isEnabled(Flags.SCREENSHOT_METADATA) && screenshot.getTaskId() >= 0) {

            mAssistContentRequester.requestAssistContent(screenshot.getTaskId(),

                    new AssistContentRequester.Callback() {

                        @Override

                        public void onAssistContentAvailable(AssistContent assistContent) {

                            screenshot.setContextUrl(assistContent.getWebUri());

                        }

                    });

        }



        if (!shouldShowUi()) {

            saveScreenshotInWorkerThread(

                    screenshot.getUserHandle(), finisher, this::logSuccessOnActionsReady,

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

+2 −10
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ import androidx.constraintlayout.widget.ConstraintLayout; 
import com.android.internal.jank.InteractionJankMonitor;

import com.android.internal.logging.UiEventLogger;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.res.R;

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

import com.android.systemui.shared.system.InputChannelCompat;
@@ -789,15 +788,8 @@ public class ScreenshotView extends FrameLayout implements 
            mUiEventLogger.log(ScreenshotEvent.SCREENSHOT_SHARE_TAPPED, 0, mPackageName);

            prepareSharedTransition();



            Intent shareIntent;

            if (mFlags.isEnabled(Flags.SCREENSHOT_METADATA) && mScreenshotData != null

                    && mScreenshotData.getContextUrl() != null) {

                shareIntent = ActionIntentCreator.INSTANCE.createShareWithText(

                        imageData.uri, mScreenshotData.getContextUrl().toString());

            } else {

                shareIntent = ActionIntentCreator.INSTANCE.createShareWithSubject(

            Intent shareIntent = ActionIntentCreator.INSTANCE.createShareWithSubject(

                    imageData.uri, imageData.subject);

            }

            mCallbacks.onAction(shareIntent, imageData.owner, false);



        });