From 117b695222135cc684e891d4126116b97a64bc9e Mon Sep 17 00:00:00 2001 From: Adam Powell Date: Mon, 5 May 2014 18:14:56 -0700 Subject: onWindowDismissed API cleanup Move the window swipe to dismiss plumbing off of Window.Callback into its own internal interface implemented by Activity and Dialog. Make it internal API instead of public. Apps should control this via the window feature setting. Change-Id: I64cd237fa7eab08719b2c34e31dac7d34f02563a --- core/java/android/app/Dialog.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'core/java/android/app/Dialog.java') diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java index a8277b5e7018..7a362df9991c 100644 --- a/core/java/android/app/Dialog.java +++ b/core/java/android/app/Dialog.java @@ -80,7 +80,7 @@ import java.lang.ref.WeakReference; * */ public class Dialog implements DialogInterface, Window.Callback, - KeyEvent.Callback, OnCreateContextMenuListener { + KeyEvent.Callback, OnCreateContextMenuListener, Window.OnWindowDismissedCallback { private static final String TAG = "Dialog"; private Activity mOwnerActivity; @@ -166,6 +166,7 @@ public class Dialog implements DialogInterface, Window.Callback, Window w = PolicyManager.makeNewWindow(mContext); mWindow = w; w.setCallback(this); + w.setOnWindowDismissedCallback(this); w.setWindowManager(mWindowManager, null, null); w.setGravity(Gravity.CENTER); mListenersHandler = new ListenersHandler(this); @@ -696,6 +697,8 @@ public class Dialog implements DialogInterface, Window.Callback, public void onDetachedFromWindow() { } + /** @hide */ + @Override public void onWindowDismissed() { dismiss(); } -- cgit v1.2.3