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

Commit 8382c6c7 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Hide the call strength icons from the statusbar"" into sc-dev

parents 7649e326 90b07771

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ 
        <item><xliff:g id="id">@string/status_bar_mobile</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_airplane</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_no_calling</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_call_strength</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_battery</xliff:g></item>

        <item><xliff:g id="id">@string/status_bar_sensors_off</xliff:g></item>

    </string-array>
@@ -96,6 +97,7 @@ 
    <string translatable="false" name="status_bar_camera">camera</string>

    <string translatable="false" name="status_bar_airplane">airplane</string>

    <string translatable="false" name="status_bar_no_calling">no_calling</string>

    <string translatable="false" name="status_bar_call_strength">call_strength</string>

    <string translatable="false" name="status_bar_sensors_off">sensors_off</string>

    <string translatable="false" name="status_bar_screen_record">screen_record</string>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -2979,6 +2979,7 @@ 
  <java-symbol type="string" name="status_bar_clock" />

  <java-symbol type="string" name="status_bar_airplane" />

  <java-symbol type="string" name="status_bar_no_calling" />

  <java-symbol type="string" name="status_bar_call_strength" />

  <java-symbol type="string" name="status_bar_mobile" />

  <java-symbol type="string" name="status_bar_ethernet" />

  <java-symbol type="string" name="status_bar_vpn" />

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

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ public class CollapsedStatusBarFragment extends Fragment implements CommandQueue 
        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));

        mDarkIconManager.setBlockList(mBlockedIcons);

        Dependency.get(StatusBarIconController.class).addIconGroup(mDarkIconManager);

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

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

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ public class KeyguardStatusBarView extends RelativeLayout implements 
        Resources r = getResources();

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

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

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

    }



    private void updateVisibilities() {

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

+4 −0
Original line number Diff line number Diff line
@@ -71,6 +71,10 @@ public interface StatusBarIconController { 
    void setSignalIcon(String slot, WifiIconState state);

    /** */

    void setMobileIcons(String slot, List<MobileIconState> states);

    /**

     * Display the no calling & SMS icons.

     */

    void setCallStrengthIcons(String slot, List<CallIndicatorIconState> states);

    /**

     * Display the no calling & SMS icons.

     */