Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-20 22:57:58 +00:00
committed by Android (Google) Code Review
parent e42880a251 6560ab752d
commit c407b0f4a7
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/globalactions/GlobalActionsDialog.java
View File

@@ -2230,6 +2230,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
}) })
.start(); .start();
dismissPanel(); dismissPanel();
dismissOverflow();
resetOrientation(); resetOrientation();
} }
@@ -2237,6 +2238,7 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
mShowing = false; mShowing = false;
if (mControlsUiController != null) mControlsUiController.hide(); if (mControlsUiController != null) mControlsUiController.hide();
dismissPanel(); dismissPanel();
dismissOverflow();
resetOrientation(); resetOrientation();
completeDismiss(); completeDismiss();
} }
@@ -2253,6 +2255,12 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
} }
} }
private void dismissOverflow() {
if (mOverflowPopup != null) {
mOverflowPopup.dismiss();
}
}
private void setRotationSuggestionsEnabled(boolean enabled) { private void setRotationSuggestionsEnabled(boolean enabled) {
try { try {
final int userId = Binder.getCallingUserHandle().getIdentifier(); final int userId = Binder.getCallingUserHandle().getIdentifier();