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

Commit a2c525fe authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Remove observer when QSBH is detached" into rvc-dev

parents 2e0fd15e 9ebcda07

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java

+7 −4
Original line number Original line Diff line number Diff line
@@ -138,6 +138,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements 
    private Clock mClockView;

    private Clock mClockView;

    private DateView mDateView;

    private DateView mDateView;

    private BatteryMeterView mBatteryRemainingIcon;

    private BatteryMeterView mBatteryRemainingIcon;

    private RingerModeTracker mRingerModeTracker;





    // Used for RingerModeTracker

    // Used for RingerModeTracker

    private final LifecycleRegistry mLifecycle = new LifecycleRegistry(this);

    private final LifecycleRegistry mLifecycle = new LifecycleRegistry(this);
@@ -159,10 +160,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements 
        mDualToneHandler = new DualToneHandler(

        mDualToneHandler = new DualToneHandler(

                new ContextThemeWrapper(context, R.style.QSHeaderTheme));

                new ContextThemeWrapper(context, R.style.QSHeaderTheme));

        mCommandQueue = commandQueue;

        mCommandQueue = commandQueue;

        ringerModeTracker.getRingerModeInternal().observe(this, ringer -> {

        mRingerModeTracker = ringerModeTracker;

            mRingerMode = ringer;

            updateStatusText();

        });

    }

    }





    @Override

    @Override
@@ -429,6 +427,10 @@ public class QuickStatusBarHeader extends RelativeLayout implements 
    @Override

    @Override

    public void onAttachedToWindow() {

    public void onAttachedToWindow() {

        super.onAttachedToWindow();

        super.onAttachedToWindow();

        mRingerModeTracker.getRingerModeInternal().observe(this, ringer -> {

            mRingerMode = ringer;

            updateStatusText();

        });

        mStatusBarIconController.addIconGroup(mIconManager);

        mStatusBarIconController.addIconGroup(mIconManager);

        requestApplyInsets();

        requestApplyInsets();

    }

    }
@@ -466,6 +468,7 @@ public class QuickStatusBarHeader extends RelativeLayout implements 
    @VisibleForTesting

    @VisibleForTesting

    public void onDetachedFromWindow() {

    public void onDetachedFromWindow() {

        setListening(false);

        setListening(false);

        mRingerModeTracker.getRingerModeInternal().removeObservers(this);

        mStatusBarIconController.removeIconGroup(mIconManager);

        mStatusBarIconController.removeIconGroup(mIconManager);

        super.onDetachedFromWindow();

        super.onDetachedFromWindow();

    }

    }