commit 8b3b67cb3534680e75c7dd6e77c36bbbce947af5
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Sep 09 15:58:57 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Sep 09 15:58:57 2024 +0000
tree 7de05c7e16f852b77a2fe64b2b7ab9a807d652e2
parent 1ab0fe4694bc2fdbf380ef8e14d2544f263486e4
parent d3a28d0249b7c5aa3497c723328aeb07231925b6

Merge "Cancel printing with escape key" into main

packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java

diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
index ff09084..c4173ed 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
@@ -460,7 +460,7 @@
 
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
-        if (keyCode == KeyEvent.KEYCODE_BACK) {
+        if (keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_ESCAPE) {
             event.startTracking();
             return true;
         }
@@ -479,7 +479,7 @@
             return true;
         }
 
-        if (keyCode == KeyEvent.KEYCODE_BACK
+        if ((keyCode == KeyEvent.KEYCODE_BACK || keyCode == KeyEvent.KEYCODE_ESCAPE)
                 && event.isTracking() && !event.isCanceled()) {
             if (mPrintPreviewController != null && mPrintPreviewController.isOptionsOpened()
                     && !hasErrors()) {