Merge "Dismiss dialog with Escape key if closeable" into main (d10af358) · Commits · e / os / android_frameworks_base

core/java/android/app/Dialog.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -679,12 +679,14 @@ public class Dialog implements DialogInterface, Window.Callback,
		if (keyCode == KeyEvent.KEYCODE_ESCAPE) {
		if (mCancelable) {
		cancel();
		} else {
		event.startTracking();
		return true;
		} else if (mWindow.shouldCloseOnTouchOutside()) {
		dismiss();
		}
		event.startTracking();
		return true;
		}
		}

		return false;
		}