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

Merge "Animate out screenshot UI on back and CLOSE_SYSTEM_DIALOGS" into rvc-qpr-dev am: 764e7ac56c

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

Change-Id: I9b48a4c979f77933639d41f4bf6a109c1dfe1b24
This commit is contained in:
TreeHugger Robot
2020-07-24 19:31:59 +00:00
committed by Automerger Merge Worker
parent 5f924b2218 764e7ac56c
commit ff2da0d09b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java
View File

@@ -493,7 +493,7 @@ public class GlobalScreenshot implements ViewTreeObserver.OnComputeInternalInset
});
mScreenshotLayout.setOnKeyListener((v, keyCode, event) -> {
if (keyCode == KeyEvent.KEYCODE_BACK) {
dismissScreenshot("back pressed", true);
dismissScreenshot("back pressed", false);
return true;
}
return false;

2
packages/SystemUI/src/com/android/systemui/screenshot/TakeScreenshotService.java
View File

@@ -61,7 +61,7 @@ public class TakeScreenshotService extends Service {
@Override
public void onReceive(Context context, Intent intent) {
if (ACTION_CLOSE_SYSTEM_DIALOGS.equals(intent.getAction()) && mScreenshot != null) {
mScreenshot.dismissScreenshot("close system dialogs", true);
mScreenshot.dismissScreenshot("close system dialogs", false);
}
}
};