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

Commit 8ea62c76 authored by Danesh Mondegarian's avatar Danesh Mondegarian
Browse files

QuickSettings : Fix update issue if linked 

Currently ribbon does not reflect updates to QS if they're linked.
This patchset addresses that.

Change-Id: I3787c30892c13dbcb7e5c48ff99cd2220b638302
parent c669c074

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+4 −1
Original line number Diff line number Diff line
@@ -453,10 +453,10 @@ public class PhoneStatusBar extends BaseStatusBar { 
                        mQuickAccessLayoutLinked ? Settings.System.QUICK_SETTINGS_TILES

                            : Settings.System.QUICK_SETTINGS_RIBBON_TILES);

                mRibbonQS.hideLiveTiles(true);

                mRibbonQS.hideLiveTileLabels(true);

                mRibbonQS.setService(this);

                mRibbonQS.setBar(mStatusBarView);

                mRibbonQS.setupQuickSettings();

                mRibbonQS.setTileTitleVisibility(false);

            }

        }

    }
@@ -3080,6 +3080,9 @@ public class PhoneStatusBar extends BaseStatusBar { 
                    mRibbonView.setVisibility(View.VISIBLE);

            } else if (mSettingsContainer != null) {

                mQS.setupQuickSettings();

                if (mQuickAccessLayoutLinked && mRibbonQS != null) {

                    mRibbonQS.setupQuickSettings();

                }

            }

        }

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java

+8 −4
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ public class QuickSettingsController { 
    public PhoneStatusBar mStatusBarService;

    private final String mSettingsString;

    private boolean mHideLiveTiles;

    private boolean mHideLiveTileLabels;



    private InputMethodTile mIMETile;
@@ -340,6 +341,11 @@ public class QuickSettingsController { 
        loadTiles();

        setupBroadcastReceiver();

        setupContentObserver();

        if (mHideLiveTileLabels) {

            for (QuickSettingsTile t : mQuickSettingsTiles) {

                t.setLabelVisibility(false);

            }

        }

    }



    void setupContentObserver() {
@@ -435,10 +441,8 @@ public class QuickSettingsController { 
        }

    }



    public void setTileTitleVisibility(boolean visible) {

        for (QuickSettingsTile t : mQuickSettingsTiles) {

            t.setLabelVisibility(visible);

        }

    public void hideLiveTileLabels(boolean hide) {

        mHideLiveTileLabels = hide;

    }



    public void hideLiveTiles(boolean hide) {