Skip to content
This repository was archived by the owner on Apr 18, 2025. It is now read-only.

Commit d0e6da5

Browse files
luk1337DylanAkp
authored andcommitted
SystemUI: screenshot: close QS after launching long screenshot activity
Change-Id: Ief5510c037b27be714f8f6cc8661d81931f3babd
1 parent 1f81f88 commit d0e6da5

1 file changed

Lines changed: 10 additions & 0 deletions

File tree

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
import com.android.internal.app.ChooserActivity;
8484
import com.android.internal.logging.UiEventLogger;
8585
import com.android.internal.policy.PhoneWindow;
86+
import com.android.internal.statusbar.IStatusBarService;
8687
import com.android.settingslib.applications.InterestingConfigChanges;
8788
import com.android.systemui.broadcast.BroadcastDispatcher;
8889
import com.android.systemui.broadcast.BroadcastSender;
@@ -241,6 +242,7 @@ public interface TransitionDestination {
241242
private final ScreenshotNotificationSmartActionsProvider
242243
mScreenshotNotificationSmartActionsProvider;
243244
private final TimeoutHandler mScreenshotHandler;
245+
private final IStatusBarService mStatusBarService;
244246
private final ActionIntentExecutor mActionIntentExecutor;
245247
private final UserManager mUserManager;
246248
private final AssistContentRequester mAssistContentRequester;
@@ -336,6 +338,7 @@ public void onCameraClosed(String cameraId) {
336338
BroadcastDispatcher broadcastDispatcher,
337339
ScreenshotNotificationSmartActionsProvider screenshotNotificationSmartActionsProvider,
338340
ScreenshotActionsController.Factory screenshotActionsControllerFactory,
341+
IStatusBarService statusBarService,
339342
ActionIntentExecutor actionIntentExecutor,
340343
ActionExecutor.Factory actionExecutorFactory,
341344
UserManager userManager,
@@ -355,6 +358,7 @@ public void onCameraClosed(String cameraId) {
355358
mMainExecutor = mainExecutor;
356359
mScrollCaptureExecutor = scrollCaptureExecutor;
357360
mScreenshotNotificationSmartActionsProvider = screenshotNotificationSmartActionsProvider;
361+
mStatusBarService = statusBarService;
358362
mBgExecutor = Executors.newSingleThreadExecutor();
359363
mBroadcastSender = broadcastSender;
360364
mBroadcastDispatcher = broadcastDispatcher;
@@ -758,6 +762,12 @@ private void startPartialScreenshotActivity(UserHandle owner) {
758762
final Intent intent = ActionIntentCreator.INSTANCE.createLongScreenshotIntent(
759763
owner, mContext);
760764
mContext.startActivity(intent);
765+
766+
try {
767+
mStatusBarService.collapsePanels();
768+
} catch (RemoteException e) {
769+
Log.e(TAG, "Error during collapsing panels", e);
770+
}
761771
},
762772
(destination, onTransitionEnd, longScreenshot) -> {
763773
onTransitionEnd.run();

0 commit comments

Comments
 (0)