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

Commit 452f8d67 authored by Jian-Yang Liu's avatar Jian-Yang Liu Committed by Android (Google) Code Review
Browse files

Merge "Updated StatusBarIconController and StatusBarSignalPolicy to check icon... 

Merge "Updated StatusBarIconController and StatusBarSignalPolicy to check icon blacklist from config value, config_statusBarIconBlacklist."
parents 90c420f6 e8df04cc

packages/SystemUI/res/values/config.xml

+9 −0
Original line number Diff line number Diff line
@@ -484,4 +484,13 @@ 
    <!-- Package name for controls plugin -->

    <string name="config_controlsPluginPackageName" translatable="false">com.android.systemui.controls.panel</string>



    <!-- Defines the blacklist for system icons.  That is to say, the icons in the status bar that

         are part of the blacklist are never displayed. Each item in the blacklist must be a string

         defined in core/res/res/config.xml to properly blacklist the icon.

     -->

    <string-array name="config_statusBarIconBlackList" translatable="false">

        <item>@*android:string/status_bar_rotate</item>

        <item>@*android:string/status_bar_headset</item>

    </string-array>



</resources>

packages/SystemUI/src/com/android/systemui/BatteryMeterView.java

+2 −1
Original line number Diff line number Diff line
@@ -288,7 +288,8 @@ public class BatteryMeterView extends LinearLayout implements 
    @Override

    public void onTuningChanged(String key, String newValue) {

        if (StatusBarIconController.ICON_BLACKLIST.equals(key)) {

            ArraySet<String> icons = StatusBarIconController.getIconBlacklist(newValue);

            ArraySet<String> icons = StatusBarIconController.getIconBlacklist(

                    getContext(), newValue);

            setVisibility(icons.contains(mSlotBattery) ? View.GONE : View.VISIBLE);

        }

    }

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

+5 −5
Original line number Diff line number Diff line
@@ -76,12 +76,12 @@ public interface StatusBarIconController { 


    public static final String ICON_BLACKLIST = "icon_blacklist";



    public static ArraySet<String> getIconBlacklist(String blackListStr) {

    /** Reads the default blacklist from config value unless blacklistStr is provided. */

    static ArraySet<String> getIconBlacklist(Context context, String blackListStr) {

        ArraySet<String> ret = new ArraySet<>();

        if (blackListStr == null) {

            blackListStr = "rotate,headset";

        }

        String[] blacklist = blackListStr.split(",");

        String[] blacklist = blackListStr == null

            ? context.getResources().getStringArray(R.array.config_statusBarIconBlackList)

            : blackListStr.split(",");

        for (String slot : blacklist) {

            if (!TextUtils.isEmpty(slot)) {

                ret.add(slot);

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

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ public class StatusBarIconControllerImpl extends StatusBarIconList implements Tu 
            return;

        }

        mIconBlacklist.clear();

        mIconBlacklist.addAll(StatusBarIconController.getIconBlacklist(newValue));

        mIconBlacklist.addAll(StatusBarIconController.getIconBlacklist(mContext, newValue));

        ArrayList<Slot> currentSlots = getSlots();

        ArrayMap<Slot, List<StatusBarIconHolder>> slotsToReAdd = new ArrayMap<>();

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

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public class StatusBarSignalPolicy implements NetworkControllerImpl.SignalCallba 
        if (!StatusBarIconController.ICON_BLACKLIST.equals(key)) {

            return;

        }

        ArraySet<String> blockList = StatusBarIconController.getIconBlacklist(newValue);

        ArraySet<String> blockList = StatusBarIconController.getIconBlacklist(mContext, newValue);

        boolean blockAirplane = blockList.contains(mSlotAirplane);

        boolean blockMobile = blockList.contains(mSlotMobile);

        boolean blockWifi = blockList.contains(mSlotWifi);