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

Commit 1ae9c8d8 authored by Timi Rautamäki's avatar Timi Rautamäki Committed by Evan Laird
Browse files

SystemUI: res array for statusbar blocked icons 



Create an array in packages/SystemUI/res/values/config.xml for statusbar
blocked icons to make it easier to overlay wanted options instead of
having to change them in code.

Test: m, verify vibrate-icon is not visible in collapsed statusbar
      on keyguard or launcher.
Signed-off-by: default avatarTimi Rautamäki <timi.rautamaki@gmail.com>
Change-Id: I9a04a67a9c0914989d34c8c53ceee97788e7ba6c
parent 3900e288

packages/SystemUI/res/values/config.xml

+14 −0
Original line number Diff line number Diff line
@@ -707,4 +707,18 @@ 
    <integer name="complicationFadeInMs">500</integer>



    <integer name="complicationRestoreMs">1000</integer>



    <!-- Icons that don't show in a collapsed non-keyguard statusbar -->

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

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

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

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

    </string-array>



    <!-- Icons that don't show in a collapsed statusbar on keyguard -->

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

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

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

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

    </string-array>

</resources>

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

+2 −5
Original line number Diff line number Diff line
@@ -59,7 +59,6 @@ import com.android.systemui.util.ViewController; 
import java.io.FileDescriptor;

import java.io.PrintWriter;

import java.util.Arrays;

import java.util.Collections;

import java.util.List;



import javax.inject.Inject;
@@ -292,10 +291,8 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 
        );



        Resources r = getResources();

        mBlockedIcons = Collections.unmodifiableList(Arrays.asList(

                r.getString(com.android.internal.R.string.status_bar_volume),

                r.getString(com.android.internal.R.string.status_bar_alarm_clock),

                r.getString(com.android.internal.R.string.status_bar_call_strength)));

        mBlockedIcons = Arrays.asList(r.getStringArray(

                R.array.config_keyguard_statusbar_icon_blocklist));

        mNotificationsHeaderCollideDistance = r.getDimensionPixelSize(

                R.dimen.header_notifications_collide_distance);

packages/SystemUI/src/com/android/systemui/statusbar/phone/fragment/CollapsedStatusBarFragment.java

+17 −4
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ import com.android.systemui.statusbar.policy.KeyguardStateController; 
import com.android.systemui.util.settings.SecureSettings;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;

import java.util.concurrent.Executor;
@@ -217,11 +218,23 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
    void updateBlockedIcons() {

        mBlockedIcons.clear();



        if (mSecureSettings.getInt(Settings.Secure.STATUS_BAR_SHOW_VIBRATE_ICON, 0) == 0) {

            mBlockedIcons.add(getString(com.android.internal.R.string.status_bar_volume));

        // Reload the blocklist from res

        List<String> blockList = Arrays.asList(getResources().getStringArray(

                R.array.config_collapsed_statusbar_icon_blocklist));

        String vibrateIconSlot = getString(com.android.internal.R.string.status_bar_volume);

        boolean showVibrateIcon =

                mSecureSettings.getInt(Settings.Secure.STATUS_BAR_SHOW_VIBRATE_ICON, 0) == 0;



        // Filter out vibrate icon from the blocklist if the setting is on

        for (int i = 0; i < blockList.size(); i++) {

            if (blockList.get(i).equals(vibrateIconSlot)) {

                if (showVibrateIcon) {

                    mBlockedIcons.add(blockList.get(i));

                }

            } else {

                mBlockedIcons.add(blockList.get(i));

            }

        }

        mBlockedIcons.add(getString(com.android.internal.R.string.status_bar_alarm_clock));

        mBlockedIcons.add(getString(com.android.internal.R.string.status_bar_call_strength));



        mMainExecutor.execute(() -> mDarkIconManager.setBlockList(mBlockedIcons));

    }