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

Commit b3b8b916 authored by Evan Laird's avatar Evan Laird Committed by Automerger Merge Worker
Browse files

Merge "SystemUI: res array for statusbar blocked icons" am: 1c631a92 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1882062

Change-Id: Ia4ea8d18c107c5dbde4d769bc61b35567be639b1
parents 835d1bd0 1c631a92

packages/SystemUI/res/values/config.xml

+13 −0
Original line number Diff line number Diff line
@@ -664,4 +664,17 @@ 
    <!-- Flag to enable privacy dot views, it shall be true for normal case -->

    <bool name="config_enablePrivacyDot">true</bool>



    <!-- 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 −4
Original line number Diff line number Diff line
@@ -263,10 +263,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

+3 −3
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ import com.android.systemui.statusbar.policy.KeyguardStateController; 
import org.jetbrains.annotations.NotNull;



import java.util.ArrayList;

import java.util.Arrays;

import java.util.List;



import javax.inject.Inject;
@@ -190,9 +191,8 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
        }

        mDarkIconManager = new DarkIconManager(view.findViewById(R.id.statusIcons), mFeatureFlags);

        mDarkIconManager.setShouldLog(true);

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

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

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

        mBlockedIcons = Arrays.asList(getResources().getStringArray(

                R.array.config_collapsed_statusbar_icon_blocklist));

        mDarkIconManager.setBlockList(mBlockedIcons);

        mStatusBarIconController.addIconGroup(mDarkIconManager);

        mSystemIconArea = mStatusBar.findViewById(R.id.system_icon_area);