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

Commit 07f95578 authored by Evan Laird's avatar Evan Laird Committed by android-build-merger
Browse files

Merge "Status bar icon ordering" into pi-dev 

am: c1adfac4

Change-Id: Id72779dc5e54b9175cacdf0c6fe0342afcb3ffbe
parents da5421c3 c1adfac4

core/res/res/values/config.xml

+4 −4
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ 
        <item><xliff:g id="id">@string/status_bar_nfc</xliff:g></item>

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

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

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

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

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

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

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

        <item><xliff:g id="id">@string/status_bar_phone_evdo_signal</xliff:g></item>
@@ -49,10 +46,13 @@ 
        <item><xliff:g id="id">@string/status_bar_managed_profile</xliff:g></item>

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

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

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

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

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

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

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

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

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

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

        <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_battery</xliff:g></item>