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

Commit eeab8b7f authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am ced8d21f: Add string for \'Ethernet\'. 

* commit 'ced8d21f':
  Add string for 'Ethernet'.
parents 89e27caa ced8d21f

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -401,6 +401,9 @@ 
    <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->

    <string name="start_dreams">Start dreams</string>



    <!-- Textual description of Ethernet connections -->

    <string name="ethernet_label">Ethernet</string>



    <!-- QuickSettings: Airplane mode [CHAR LIMIT=NONE] -->

    <string name="quick_settings_airplane_mode_label">Airplane mode</string>

    <!-- QuickSettings: Battery Charging [CHAR LIMIT=NONE] -->

packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java

+1 −2
Original line number Diff line number Diff line
@@ -1097,8 +1097,7 @@ public class NetworkController extends BroadcastReceiver { 


        final boolean ethernetConnected = (mConnectedNetworkType == ConnectivityManager.TYPE_ETHERNET);

        if (ethernetConnected) {

            // TODO: icons and strings for Ethernet connectivity

            combinedLabel = mConnectedNetworkTypeName;

            combinedLabel = context.getString(R.string.ethernet_label);

        }



        if (mAirplaneMode &&