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

Commit a5e93410 authored by Youngjun Kwak's avatar Youngjun Kwak Committed by Android (Google) Code Review
Browse files

Merge "Update language to comply with Android's inclusive language guidance"

parents 127fa988 06c1f52a
Loading
Loading
Loading
Loading
+4 −6
Original line number Diff line number Diff line
@@ -515,13 +515,11 @@
    <!-- Whether or not to add a "people" notifications section -->
    <bool name="config_usePeopleFiltering">false</bool>

    <!-- 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.

         TODO: See if we can rename this config variable.
    <!-- Defines system icons to be excluded from the display. That is to say, the icons in the
         status bar that are part of this list are never displayed. Each item in the list must be a
         string defined in core/res/res/config.xml to properly exclude the icon.
     -->
    <string-array name="config_statusBarIconBlackList" translatable="false">
    <string-array name="config_statusBarIconsToExclude" translatable="false">
        <item>@*android:string/status_bar_rotate</item>
        <item>@*android:string/status_bar_headset</item>
    </string-array>
+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ public interface StatusBarIconController {
    static ArraySet<String> getIconHideList(Context context, String hideListStr) {
        ArraySet<String> ret = new ArraySet<>();
        String[] hideList = hideListStr == null
            ? context.getResources().getStringArray(R.array.config_statusBarIconBlackList)
            ? context.getResources().getStringArray(R.array.config_statusBarIconsToExclude)
            : hideListStr.split(",");
        for (String slot : hideList) {
            if (!TextUtils.isEmpty(slot)) {