diff options
| author | Daniel Sandler <dsandler@android.com> | 2012-09-12 17:33:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-21 07:32:04 -0700 |
| commit | ced8d21f5abf46d128264a3039f7a84155d2b9dc (patch) | |
| tree | c02cd42f61a74090a1ebdcea777f790f5141093f /packages | |
| parent | 0887711d0f76d858501fd017259ddfdc1950eb3f (diff) | |
| download | frameworks_base-ced8d21f5abf46d128264a3039f7a84155d2b9dc.zip frameworks_base-ced8d21f5abf46d128264a3039f7a84155d2b9dc.tar.gz frameworks_base-ced8d21f5abf46d128264a3039f7a84155d2b9dc.tar.bz2 | |
Add string for 'Ethernet'.
Bug: 6676469
Change-Id: Icbeb3e96b8580850a8392f443dc277488631bcab
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 4545706..e05c9a5 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -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] --> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java index ee82777..463aacb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -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 && |