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

Unverified Commit e306e7ec authored by LuK1337's avatar LuK1337 Committed by Michael Bestas
Browse files

SystemUI: screenshot: close QS after launching long screenshot activity 

Change-Id: Ief5510c037b27be714f8f6cc8661d81931f3babd
parent bde697ed

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

+10 −0
Original line number Original line Diff line number Diff line
@@ -88,6 +88,7 @@ import androidx.concurrent.futures.CallbackToFutureAdapter; 
import com.android.internal.app.ChooserActivity;

import com.android.internal.app.ChooserActivity;

import com.android.internal.logging.UiEventLogger;

import com.android.internal.logging.UiEventLogger;

import com.android.internal.policy.PhoneWindow;

import com.android.internal.policy.PhoneWindow;

import com.android.internal.statusbar.IStatusBarService;

import com.android.settingslib.applications.InterestingConfigChanges;

import com.android.settingslib.applications.InterestingConfigChanges;

import com.android.systemui.R;

import com.android.systemui.R;

import com.android.systemui.broadcast.BroadcastSender;

import com.android.systemui.broadcast.BroadcastSender;
@@ -261,6 +262,7 @@ public class ScreenshotController { 
    private final PhoneWindow mWindow;

    private final PhoneWindow mWindow;

    private final DisplayManager mDisplayManager;

    private final DisplayManager mDisplayManager;

    private final ScrollCaptureController mScrollCaptureController;

    private final ScrollCaptureController mScrollCaptureController;

    private final IStatusBarService mStatusBarService;

    private final LongScreenshotData mLongScreenshotHolder;

    private final LongScreenshotData mLongScreenshotHolder;

    private final boolean mIsLowRamDevice;

    private final boolean mIsLowRamDevice;

    private final TimeoutHandler mScreenshotHandler;

    private final TimeoutHandler mScreenshotHandler;
@@ -295,6 +297,7 @@ public class ScreenshotController { 
            ImageExporter imageExporter,

            ImageExporter imageExporter,

            @Main Executor mainExecutor,

            @Main Executor mainExecutor,

            ScrollCaptureController scrollCaptureController,

            ScrollCaptureController scrollCaptureController,

            IStatusBarService statusBarService,

            LongScreenshotData longScreenshotHolder,

            LongScreenshotData longScreenshotHolder,

            ActivityManager activityManager,

            ActivityManager activityManager,

            TimeoutHandler timeoutHandler,

            TimeoutHandler timeoutHandler,
@@ -306,6 +309,7 @@ public class ScreenshotController { 
        mImageExporter = imageExporter;

        mImageExporter = imageExporter;

        mMainExecutor = mainExecutor;

        mMainExecutor = mainExecutor;

        mScrollCaptureController = scrollCaptureController;

        mScrollCaptureController = scrollCaptureController;

        mStatusBarService = statusBarService;

        mLongScreenshotHolder = longScreenshotHolder;

        mLongScreenshotHolder = longScreenshotHolder;

        mIsLowRamDevice = activityManager.isLowRamDevice();

        mIsLowRamDevice = activityManager.isLowRamDevice();

        mBgExecutor = Executors.newSingleThreadExecutor();

        mBgExecutor = Executors.newSingleThreadExecutor();
@@ -714,6 +718,12 @@ public class ScreenshotController { 
        } catch (Exception e) {

        } catch (Exception e) {

            Log.e(TAG, "Error overriding screenshot app transition", e);

            Log.e(TAG, "Error overriding screenshot app transition", e);

        }

        }



        try {

            mStatusBarService.collapsePanels();

        } catch (RemoteException e) {

            Log.e(TAG, "Error during collapsing panels", e);

        }

    }

    }





    private void startPartialScreenshotActivity() {

    private void startPartialScreenshotActivity() {