Merge "Fix OnCancelListener for Dialogs on swipe to dismiss. am: 67639a5f67... (c5114da9) · Commits · e / os / android_frameworks_base

core/java/android/app/Dialog.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -185,6 +185,11 @@ public class Dialog implements DialogInterface, Window.Callback,
		mWindow = w;
		w.setCallback(this);
		w.setOnWindowDismissedCallback(this);
		w.setOnWindowSwipeDismissedCallback(() -> {
		if (mCancelable) {
		cancel();
		}
		});
		w.setWindowManager(mWindowManager, null, null);
		w.setGravity(Gravity.CENTER);

core/java/android/view/Window.java

+25 −0

Original line number	Diff line number	Diff line
		@@ -274,6 +274,7 @@ public abstract class Window {
		private TypedArray mWindowStyle;
		private Callback mCallback;
		private OnWindowDismissedCallback mOnWindowDismissedCallback;
		private OnWindowSwipeDismissedCallback mOnWindowSwipeDismissedCallback;
		private WindowControllerCallback mWindowControllerCallback;
		private OnRestrictedCaptionAreaChangedListener mOnRestrictedCaptionAreaChangedListener;
		private Rect mRestrictedCaptionAreaRect;
		@@ -586,6 +587,18 @@ public abstract class Window {
		void onWindowDismissed(boolean finishTask, boolean suppressWindowTransition);
		}

		/** @hide */
		public interface OnWindowSwipeDismissedCallback {
		/**
		* Called when a window is swipe dismissed. This informs the callback that the
		* window is gone, and it should finish itself.
		* @param finishTask True if the task should also be finished.
		* @param suppressWindowTransition True if the resulting exit and enter window transition
		* animations should be suppressed.
		*/
		void onWindowSwipeDismissed();
		}

		/** @hide */
		public interface WindowControllerCallback {
		/**
		@@ -879,6 +892,18 @@ public abstract class Window {
		}
		}

		/** @hide */
		public final void setOnWindowSwipeDismissedCallback(OnWindowSwipeDismissedCallback sdcb) {
		mOnWindowSwipeDismissedCallback = sdcb;
		}

		/** @hide */
		public final void dispatchOnWindowSwipeDismissed() {
		if (mOnWindowSwipeDismissedCallback != null) {
		mOnWindowSwipeDismissedCallback.onWindowSwipeDismissed();
		}
		}

		/** @hide */
		public final void setWindowControllerCallback(WindowControllerCallback wccb) {
		mWindowControllerCallback = wccb;

core/java/com/android/internal/policy/PhoneWindow.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -2997,6 +2997,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
		swipeDismiss.setOnDismissedListener(new SwipeDismissLayout.OnDismissedListener() {
		@Override
		public void onDismissed(SwipeDismissLayout layout) {
		dispatchOnWindowSwipeDismissed();
		dispatchOnWindowDismissed(false /finishTask/, true /suppressWindowTransition/);
		}
		});