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

Commit 6134c52f authored by d34d's avatar d34d
Browse files

SysUI: Re-add status icons in recreateStatusBar() 

Change-Id: If25f1f792ca08f7e59d5a1a167d55324adca9c30
parent adb285ed

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

+6 −8
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ import com.android.systemui.statusbar.NotificationOverflowContainer; 
import com.android.systemui.statusbar.ScrimView;

import com.android.systemui.statusbar.SignalClusterView;

import com.android.systemui.statusbar.SpeedBumpView;

import com.android.systemui.statusbar.StatusBarIconView;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.VisualizerView;

import com.android.systemui.statusbar.phone.UnlockMethodCache.OnUnlockMethodChangedListener;
@@ -3598,22 +3599,21 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        mStatusBarWindow.removeContent(mStatusBarWindowContent);

        mStatusBarWindow.clearDisappearingChildren();



        RankingMap rankingMap = mNotificationData.getRankingMap();

        // extract icons from the soon-to-be recreated viewgroup.

        /*

        int nIcons = mStatusIcons != null ? mStatusIcons.getChildCount() : 0;

        ViewGroup statusIcons = mIconController.getStatusIcons();

        int nIcons = statusIcons != null ? statusIcons.getChildCount() : 0;

        ArrayList<StatusBarIcon> icons = new ArrayList<StatusBarIcon>(nIcons);

        ArrayList<String> iconSlots = new ArrayList<String>(nIcons);

        for (int i = 0; i < nIcons; i++) {

            StatusBarIconView iconView = (StatusBarIconView)mStatusIcons.getChildAt(i);

            StatusBarIconView iconView = (StatusBarIconView) statusIcons.getChildAt(i);

            icons.add(iconView.getStatusBarIcon());

            iconSlots.add(iconView.getStatusBarSlot());

        }

        */



        removeAllViews(mStatusBarWindowContent);



        // extract notifications.

        RankingMap rankingMap = mNotificationData.getRankingMap();

        int nNotifs = mNotificationData.size();

        ArrayList<Pair<String, StatusBarNotification>> notifications =

                new ArrayList<Pair<String, StatusBarNotification>>(nNotifs);
@@ -3623,14 +3623,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
        makeStatusBarView();

        repositionNavigationBar();



        // recreate StatusBarIconViews.

        /*

        // re-add status icons

        for (int i = 0; i < nIcons; i++) {

            StatusBarIcon icon = icons.get(i);

            String slot = iconSlots.get(i);

            addIcon(slot, i, i, icon);

        }

        */



        // recreate notifications.

        for (int i = 0; i < nNotifs; i++) {

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

+4 −0
Original line number Diff line number Diff line
@@ -482,6 +482,10 @@ public class StatusBarIconController implements Tunable { 
        refreshAllIconsForLayout(mNotificationIcons);

    }



    public LinearLayout getStatusIcons() {

        return mStatusIcons;

    }



    private void refreshAllIconsForLayout(LinearLayout ll) {

        final int count = ll.getChildCount();

        for (int n = 0; n < count; n++) {