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

Commit 9448f1b7 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix double status bar icons" into nyc-mr1-dev

parents af9d5daa c6fe61c5

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

+0 −1
Original line number Diff line number Diff line
@@ -3522,7 +3522,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 


        repositionNavigationBar();

        updateRowStates();

        mIconController.defineSlots();

        mScreenPinningRequest.onConfigurationChanged();

        mNetworkController.onConfigurationChanged();

    }

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

+2 −6
Original line number Diff line number Diff line
@@ -112,6 +112,8 @@ public class StatusBarIconController extends StatusBarIconList implements Tunabl 


    public StatusBarIconController(Context context, View statusBar, View keyguardStatusBar,

            PhoneStatusBar phoneStatusBar) {

        super(context.getResources().getStringArray(

                com.android.internal.R.array.config_statusBarIcons));

        mContext = context;

        mPhoneStatusBar = phoneStatusBar;

        mSystemIconArea = (LinearLayout) statusBar.findViewById(R.id.system_icon_area);
@@ -137,7 +139,6 @@ public class StatusBarIconController extends StatusBarIconList implements Tunabl 
        mDarkModeIconColorSingleTone = context.getColor(R.color.dark_mode_icon_color_single_tone);

        mLightModeIconColorSingleTone = context.getColor(R.color.light_mode_icon_color_single_tone);

        mHandler = new Handler();

        defineSlots();

        loadDimens();



        TunerService.get(mContext).addTunable(this, ICON_BLACKLIST);
@@ -197,11 +198,6 @@ public class StatusBarIconController extends StatusBarIconList implements Tunabl 
                R.dimen.status_bar_icon_padding);

    }



    public void defineSlots() {

        defineSlots(mContext.getResources().getStringArray(

                com.android.internal.R.array.config_statusBarIcons));

    }



    private void addSystemIcon(int index, StatusBarIcon icon) {

        String slot = getSlot(index);

        int viewIndex = getViewIndex(index);

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

+2 −5
Original line number Diff line number Diff line
@@ -25,16 +25,13 @@ public class StatusBarIconList { 
    private ArrayList<String> mSlots = new ArrayList<>();

    private ArrayList<StatusBarIcon> mIcons = new ArrayList<>();



    public void defineSlots(String[] slots) {

        mSlots.clear();

    public StatusBarIconList(String[] slots) {

        final int N = slots.length;

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

            mSlots.add(slots[i]);

            if (mIcons.size() < mSlots.size()) {

            mIcons.add(null);

        }

    }

    }



    public int getSlotIndex(String slot) {

        final int N = mSlots.size();