Merge "Ensure power menu overflow dismissed when dialog dismissed." into rvc-dev (c407b0f4) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -2230,6 +2230,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		})
		.start();
		dismissPanel();
		dismissOverflow();
		resetOrientation();
		}

		@@ -2237,6 +2238,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		mShowing = false;
		if (mControlsUiController != null) mControlsUiController.hide();
		dismissPanel();
		dismissOverflow();
		resetOrientation();
		completeDismiss();
		}
		@@ -2253,6 +2255,12 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
		}
		}

		private void dismissOverflow() {
		if (mOverflowPopup != null) {
		mOverflowPopup.dismiss();
		}
		}

		private void setRotationSuggestionsEnabled(boolean enabled) {
		try {
		final int userId = Binder.getCallingUserHandle().getIdentifier();