Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Close system dialogs before launching LongScreenshotsActivity" into tm-qpr-dev

Browse Source
This commit is contained in:
Matt Casey
2022-11-23 19:09:00 +00:00
committed by Android (Google) Code Review
parent aa820945ad 30731e7219
commit bb15492781
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
View File

@@ -739,10 +739,14 @@ public class ScreenshotController {
mLongScreenshotHolder.setLongScreenshot(longScreenshot); mLongScreenshotHolder.setLongScreenshot(longScreenshot);
mLongScreenshotHolder.setTransitionDestinationCallback( mLongScreenshotHolder.setTransitionDestinationCallback(
(transitionDestination, onTransitionEnd) -> (transitionDestination, onTransitionEnd) -> {
mScreenshotView.startLongScreenshotTransition( mScreenshotView.startLongScreenshotTransition(
transitionDestination, onTransitionEnd, transitionDestination, onTransitionEnd,
longScreenshot)); longScreenshot);
// TODO: Do this via ActionIntentExecutor instead.
mContext.sendBroadcast(new Intent(Intent.ACTION_CLOSE_SYSTEM_DIALOGS));
}
);
final Intent intent = new Intent(mContext, LongScreenshotActivity.class); final Intent intent = new Intent(mContext, LongScreenshotActivity.class);
intent.putExtra(LongScreenshotActivity.EXTRA_SCREENSHOT_USER_HANDLE, intent.putExtra(LongScreenshotActivity.EXTRA_SCREENSHOT_USER_HANDLE,

1
packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotView.java
View File

@@ -898,6 +898,7 @@ public class ScreenshotView extends FrameLayout implements
void startLongScreenshotTransition(Rect destination, Runnable onTransitionEnd, void startLongScreenshotTransition(Rect destination, Runnable onTransitionEnd,
ScrollCaptureController.LongScreenshot longScreenshot) { ScrollCaptureController.LongScreenshot longScreenshot) {
mPendingSharedTransition = true;
AnimatorSet animSet = new AnimatorSet(); AnimatorSet animSet = new AnimatorSet();
ValueAnimator scrimAnim = ValueAnimator.ofFloat(0, 1); ValueAnimator scrimAnim = ValueAnimator.ofFloat(0, 1);