commit 2dfaafff11b08a4f2db262275934ecbbc7c5b3bf
author Miranda Kephart <mkephart@google.com> Mon Apr 03 09:18:07 2023 -0400
committer Miranda Kephart <mkephart@google.com> Mon Apr 03 09:18:07 2023 -0400
tree 79140e5585a3d6a27044b8855156c53931ac0c10
parent d64b95880935ab256069ea5f8c7e2ca3861dabd0

Dismiss screenshots on escape key

Same handling as when the back key is pressed.

Bug: 276488325
Fix: 276488325
Test: adb shell input keyevent 111
Change-Id: Ib50480b2eb5d32600cad697e25f362585c2b97d1

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

diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
index a9af1a2..0855e65 100644
--- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
+++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotController.java
@@ -290,7 +290,7 @@
         if (DEBUG_INPUT) {
             Log.d(TAG, "Predictive Back callback dispatched");
         }
-        respondToBack();
+        respondToKeyDismissal();
     };
 
     private ScreenshotView mScreenshotView;
@@ -615,7 +615,7 @@
         }
     }
 
-    private void respondToBack() {
+    private void respondToKeyDismissal() {
         dismissScreenshot(SCREENSHOT_DISMISSED_OTHER);
     }
 
@@ -675,11 +675,11 @@
         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;