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

Commit 53e56803 authored by Jordan Demeulenaere's avatar Jordan Demeulenaere Committed by Automerger Merge Worker
Browse files

Merge changes Ib5223991,Ib238823a into udc-dev am: 21cb4246 am: c117fae3 

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



Change-Id: I0c797e3baf2c8aabc8df9545f82eae8072f13176
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2d8698f0 c117fae3

packages/SystemUI/src/com/android/systemui/bluetooth/BroadcastDialog.java

+2 −4
Original line number Diff line number Diff line
@@ -155,8 +155,7 @@ public class BroadcastDialog extends SystemUIDialog { 
    }



    @Override

    public void onStart() {

        super.onStart();

    public void start() {

        registerBroadcastCallBack(mExecutor, mBroadcastCallback);

    }
@@ -200,8 +199,7 @@ public class BroadcastDialog extends SystemUIDialog { 
    }



    @Override

    public void onStop() {

        super.onStop();

    public void stop() {

        unregisterBroadcastCallBack(mBroadcastCallback);

    }

packages/SystemUI/src/com/android/systemui/contrast/ContrastDialog.kt

+2 −4
Original line number Diff line number Diff line
@@ -86,13 +86,11 @@ class ContrastDialog( 
        highlightContrast(toContrastLevel(initialContrast))

    }



    override fun onStart() {

        super.onStart()

    override fun start() {

        uiModeManager.addContrastChangeListener(mainExecutor, this)

    }



    override fun onStop() {

        super.onStop()

    override fun stop() {

        uiModeManager.removeContrastChangeListener(this)

    }

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

+2 −4
Original line number Diff line number Diff line
@@ -2477,8 +2477,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 
        }



        @Override

        protected void onStart() {

            super.onStart();

        protected void start() {

            mGlobalActionsLayout.updateList();



            if (mBackgroundDrawable instanceof ScrimDrawable) {
@@ -2509,8 +2508,7 @@ public class GlobalActionsDialogLite implements DialogInterface.OnDismissListene 
        }



        @Override

        protected void onStop() {

            super.onStop();

        protected void stop() {

            mColorExtractor.removeOnColorsChangedListener(this);

        }

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBaseDialog.java

+2 −4
Original line number Diff line number Diff line
@@ -273,8 +273,7 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements 
    }



    @Override

    public void onStart() {

        super.onStart();

    public void start() {

        mMediaOutputController.start(this);

        if (isBroadcastSupported() && !mIsLeBroadcastCallbackRegistered) {

            mMediaOutputController.registerLeBroadcastServiceCallback(mExecutor,
@@ -284,8 +283,7 @@ public abstract class MediaOutputBaseDialog extends SystemUIDialog implements 
    }



    @Override

    public void onStop() {

        super.onStop();

    public void stop() {

        if (isBroadcastSupported() && mIsLeBroadcastCallbackRegistered) {

            mMediaOutputController.unregisterLeBroadcastServiceCallback(mBroadcastCallback);

            mIsLeBroadcastCallbackRegistered = false;

packages/SystemUI/src/com/android/systemui/media/dialog/MediaOutputBroadcastDialog.java

+4 −4
Original line number Diff line number Diff line
@@ -212,8 +212,8 @@ public class MediaOutputBroadcastDialog extends MediaOutputBaseDialog { 
    }



    @Override

    public void onStart() {

        super.onStart();

    public void start() {

        super.start();

        if (!mIsLeBroadcastAssistantCallbackRegistered) {

            mIsLeBroadcastAssistantCallbackRegistered = true;

            mMediaOutputController.registerLeBroadcastAssistantServiceCallback(mExecutor,
@@ -223,8 +223,8 @@ public class MediaOutputBroadcastDialog extends MediaOutputBaseDialog { 
    }



    @Override

    public void onStop() {

        super.onStop();

    public void stop() {

        super.stop();

        if (mIsLeBroadcastAssistantCallbackRegistered) {

            mIsLeBroadcastAssistantCallbackRegistered = false;

            mMediaOutputController.unregisterLeBroadcastAssistantServiceCallback(