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

Commit 618e47a2 authored by Ajinkya Chalke's avatar Ajinkya Chalke
Browse files

Update app clips package style. 

Bug: 269403503
Test: atest AppClipsActivityTest AppClipsTrampolineActivityTest
AppClipsViewModelTest

Change-Id: I41b84f07f528b49820bc5ba60d31bd9e5db6f687
parent 27fb0488

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/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;

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

+3 −3
Original line number Diff line number Diff line
@@ -32,12 +32,12 @@ import javax.inject.Inject; 


/** An intermediary singleton object to help communicating with the cross process service. */

@SysUISingleton

public class AppClipsCrossProcessHelper {

class AppClipsCrossProcessHelper {



    private final ServiceConnector<IAppClipsScreenshotHelperService> mProxyConnector;



    @Inject

    public AppClipsCrossProcessHelper(@Application Context context) {

    AppClipsCrossProcessHelper(@Application Context context) {

        mProxyConnector = new ServiceConnector.Impl<IAppClipsScreenshotHelperService>(context,

                new Intent(context, AppClipsScreenshotHelperService.class),

                Context.BIND_AUTO_CREATE | Context.BIND_WAIVE_PRIORITY
@@ -52,7 +52,7 @@ public class AppClipsCrossProcessHelper { 
     * pass around but not a {@link Bitmap}.

     */

    @Nullable

    public Bitmap takeScreenshot() {

    Bitmap takeScreenshot() {

        try {

            AndroidFuture<ScreenshotHardwareBufferInternal> future =

                    mProxyConnector.postForResult(

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

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.systemui.screenshot.appclips;



import com.android.internal.logging.UiEvent;

import com.android.internal.logging.UiEventLogger;



enum AppClipsEvent implements UiEventLogger.UiEventEnum {



    @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);



    private final int mId;



    AppClipsEvent(int id) {

        mId = id;

    }



    @Override

    public int getId() {

        return mId;

    }

}