commit d10af3582c4fc5273e98553c2e449a3713b25163
author Josep del Río <joseprio@google.com> Wed May 15 15:49:57 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 15 15:49:57 2024 +0000
tree cee779568d705a3d45946d68a08fc23eb5367c21
parent 6f67bf715a8cfea8ced1c86030d2128b5f7b0f0a
parent b2d272bd5388d420109c8f8394b06c420f320de0

Merge "Dismiss dialog with Escape key if closeable" into main

core/java/android/app/Dialog.java

diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java
index 0e20138..cd7f1e4 100644
--- a/core/java/android/app/Dialog.java
+++ b/core/java/android/app/Dialog.java
@@ -679,11 +679,13 @@
         if (keyCode == KeyEvent.KEYCODE_ESCAPE) {
             if (mCancelable) {
                 cancel();
-            } else {
+                event.startTracking();
+                return true;
+            } else if (mWindow.shouldCloseOnTouchOutside()) {
                 dismiss();
+                event.startTracking();
+                return true;
             }
-            event.startTracking();
-            return true;
         }
 
         return false;