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

Merge "Dismiss screenshots on escape key" into udc-dev

Browse Source
This commit is contained in:
Miranda Kephart
2023-04-06 16:59:18 +00:00
committed by Android (Google) Code Review
parent adddf61884 2dfaafff11
commit f304ffc940
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -289,7 +289,7 @@ public class ScreenshotController {
if (DEBUG_INPUT) {
Log.d(TAG, "Predictive Back callback dispatched");
}
respondToBack();
respondToKeyDismissal();
};
private ScreenshotView mScreenshotView;
@@ -581,7 +581,7 @@ public class ScreenshotController {
}
}
private void respondToBack() {
private void respondToKeyDismissal() {
dismissScreenshot(SCREENSHOT_DISMISSED_OTHER);
}
@@ -641,11 +641,11 @@ public class ScreenshotController {
mScreenshotView.setDefaultTimeoutMillis(mScreenshotHandler.getDefaultTimeoutMillis());
mScreenshotView.setOnKeyListener((v, keyCode, event) -> {
if (keyCode == KeyEvent.KEYCODE_BACK) {
if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_ESCAPE) {
if (DEBUG_INPUT) {
Log.d(TAG, "onKeyEvent: KeyEvent.KEYCODE_BACK");
Log.d(TAG, "onKeyEvent: " + keyCode);
}
respondToBack();
respondToKeyDismissal();
return true;
}
return false;