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

Commit d7a24536 authored by Ajinkya Chalke's avatar Ajinkya Chalke Committed by Automerger Merge Worker
Browse files

Merge changes from topic "fix-flake" into udc-dev am: 334b55d7 

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



Change-Id: I2f03690b2898b765e870e69ed919685a6d916266
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 44e1f1c2 334b55d7

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

+2 −2
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ import com.android.systemui.hdmi.HdmiCecSetMenuLanguageActivity; 
import com.android.systemui.keyguard.WorkLockActivity;

import com.android.systemui.people.PeopleSpaceActivity;

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

import com.android.systemui.screenshot.AppClipsActivity;

import com.android.systemui.screenshot.AppClipsTrampolineActivity;

import com.android.systemui.screenshot.LongScreenshotActivity;

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

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

import com.android.systemui.sensorprivacy.SensorUseStartedActivity;

import com.android.systemui.sensorprivacy.television.TvSensorPrivacyChangedActivity;

import com.android.systemui.sensorprivacy.television.TvUnblockSensorActivity;

packages/SystemUI/src/com/android/systemui/notetask/NoteTaskEntryPoint.kt

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ package com.android.systemui.notetask 


import com.android.systemui.notetask.quickaffordance.NoteTaskQuickAffordanceConfig

import com.android.systemui.notetask.shortcut.LaunchNoteTaskActivity

import com.android.systemui.screenshot.AppClipsTrampolineActivity

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



/**

 * Supported entry points for [NoteTaskController.showNoteTask].

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

+12 −10
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ import java.util.concurrent.Executor; 


import javax.inject.Inject;



class ImageExporter {

/** A class to help with exporting screenshot to storage. */

public class ImageExporter {

    private static final String TAG = LogConfig.logTag(ImageExporter.class);



    static final Duration PENDING_ENTRY_TTL = Duration.ofHours(24);
@@ -90,7 +91,7 @@ class ImageExporter { 
    private final FeatureFlags mFlags;



    @Inject

    ImageExporter(ContentResolver resolver, FeatureFlags flags) {

    public ImageExporter(ContentResolver resolver, FeatureFlags flags) {

        mResolver = resolver;

        mFlags = flags;

    }
@@ -148,7 +149,7 @@ 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,

            UserHandle owner) {

        return export(executor, requestId, bitmap, ZonedDateTime.now(), owner);

    }
@@ -181,13 +182,14 @@ class ImageExporter { 
        );

    }



    static class Result {

        Uri uri;

        UUID requestId;

        String fileName;

        long timestamp;

        CompressFormat format;

        boolean published;

    /** The result returned by the task exporting screenshots to storage. */

    public static class Result {

        public Uri uri;

        public UUID requestId;

        public String fileName;

        public long timestamp;

        public CompressFormat format;

        public boolean published;



        @Override

        public String toString() {

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

+1 −7
Original line number Diff line number Diff line
@@ -93,13 +93,7 @@ public enum ScreenshotEvent implements UiEventLogger.UiEventEnum { 
    @UiEvent(doc = "User has discarded the result of a long screenshot")

    SCREENSHOT_LONG_SCREENSHOT_EXIT(911),

    @UiEvent(doc = "A screenshot has been taken and saved to work profile")

    SCREENSHOT_SAVED_TO_WORK_PROFILE(1240),

    @UiEvent(doc = "Notes application triggered the screenshot for notes")

    SCREENSHOT_FOR_NOTE_TRIGGERED(1308),

    @UiEvent(doc = "User accepted the screenshot to be sent to the notes app")

    SCREENSHOT_FOR_NOTE_ACCEPTED(1309),

    @UiEvent(doc = "User cancelled the screenshot for notes app flow")

    SCREENSHOT_FOR_NOTE_CANCELLED(1310);

    SCREENSHOT_SAVED_TO_WORK_PROFILE(1240);



    private final int mId;

packages/SystemUI/src/com/android/systemui/screenshot/appclips/AppClipsActivity.java

+10 −8
Original line number Diff line number Diff line
@@ -14,15 +14,15 @@ 
 * limitations under the License.

 */



package com.android.systemui.screenshot;

package com.android.systemui.screenshot.appclips;



import static com.android.systemui.screenshot.AppClipsTrampolineActivity.ACTION_FINISH_FROM_TRAMPOLINE;

import static com.android.systemui.screenshot.AppClipsTrampolineActivity.EXTRA_CALLING_PACKAGE_NAME;

import static com.android.systemui.screenshot.AppClipsTrampolineActivity.EXTRA_RESULT_RECEIVER;

import static com.android.systemui.screenshot.AppClipsTrampolineActivity.EXTRA_SCREENSHOT_URI;

import static com.android.systemui.screenshot.AppClipsTrampolineActivity.PERMISSION_SELF;

import static com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_FOR_NOTE_ACCEPTED;

import static com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_FOR_NOTE_CANCELLED;

import static com.android.systemui.screenshot.appclips.AppClipsEvent.SCREENSHOT_FOR_NOTE_ACCEPTED;

import static com.android.systemui.screenshot.appclips.AppClipsEvent.SCREENSHOT_FOR_NOTE_CANCELLED;

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

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

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

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

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



import android.app.Activity;

import android.content.BroadcastReceiver;
@@ -52,6 +52,8 @@ import com.android.internal.logging.UiEventLogger; 
import com.android.internal.logging.UiEventLogger.UiEventEnum;

import com.android.settingslib.Utils;

import com.android.systemui.R;

import com.android.systemui.screenshot.CropView;

import com.android.systemui.screenshot.MagnifierView;

import com.android.systemui.settings.UserTracker;



import javax.inject.Inject;