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

Dismiss screenshots on escape key

Browse Source 
Same handling as when the back key is pressed.

Bug: 276488325
Fix: 276488325
Test: adb shell input keyevent 111
Change-Id: Ib50480b2eb5d32600cad697e25f362585c2b97d1
This commit is contained in:
Miranda Kephart
2023-04-03 09:18:07 -04:00
parent d64b958809
commit 2dfaafff11
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

@@ -290,7 +290,7 @@ public class ScreenshotController {
if (DEBUG_INPUT) {
Log.d(TAG, "Predictive Back callback dispatched");
}
respondToBack();
respondToKeyDismissal();
};
private ScreenshotView mScreenshotView;
@@ -615,7 +615,7 @@ public class ScreenshotController {
}
}
private void respondToBack() {
private void respondToKeyDismissal() {
dismissScreenshot(SCREENSHOT_DISMISSED_OTHER);
}
@@ -675,11 +675,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;