Merge "Ensure power menu overflow dismissed when dialog dismissed." into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-04-20 22:57:58 +00:00
committed by Android (Google) Code Review

View File

@@ -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();