Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ede57198 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Controls UI - Wait for callback to potentially show controls" into rvc-dev am: 0d425c2e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702453

Change-Id: I3f2b28b66e1d48553f0a4004a1e4c6e98365b414
parents 51aa6d77 0d425c2e

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

+9 −1
Original line number Diff line number Diff line
@@ -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