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

Merge "Controls UI - Wait for callback to potentially show controls" into rvc-dev

Browse Source
This commit is contained in:
Matt Pietal
2020-06-03 17:41:50 +00:00
committed by Android (Google) Code Review
parent 00cba9da56 a33e075a6b
commit 0d425c2e4e
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -391,7 +391,15 @@ public class GlobalActionsDialog implements DialogInterface.OnDismissListener,
if (controlsComponent.getControlsListingController().isPresent()) {
controlsComponent.getControlsListingController().get()
.addCallback(list -> mControlsServiceInfos = list);
.addCallback(list -> {
mControlsServiceInfos = list;
// This callback may occur after the dialog has been shown.
// If so, add controls into the already visible space
if (mDialog != null && !mDialog.isShowingControls()
&& shouldShowControls()) {
mDialog.showControls(mControlsUiControllerOptional.get());
}
});
}
// Need to be user-specific with the context to make sure we read the correct prefs