Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'ced8d21f5abf46d128264a3039f7a84155d2b9dc':
  Add string for 'Ethernet'.
This commit is contained in:
Daniel Sandler
2012-09-21 08:02:02 -07:00
committed by Android Git Automerger
parent 89e27caa0c ced8d21f5a
commit eeab8b7fb3
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/res/values/strings.xml
View File

@@ -401,6 +401,9 @@
<!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] --> <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
<string name="start_dreams">Start dreams</string> <string name="start_dreams">Start dreams</string>
<!-- Textual description of Ethernet connections -->
<string name="ethernet_label">Ethernet</string>
<!-- QuickSettings: Airplane mode [CHAR LIMIT=NONE] --> <!-- QuickSettings: Airplane mode [CHAR LIMIT=NONE] -->
<string name="quick_settings_airplane_mode_label">Airplane mode</string> <string name="quick_settings_airplane_mode_label">Airplane mode</string>
<!-- QuickSettings: Battery Charging [CHAR LIMIT=NONE] --> <!-- QuickSettings: Battery Charging [CHAR LIMIT=NONE] -->

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

@@ -1097,8 +1097,7 @@ public class NetworkController extends BroadcastReceiver {
final boolean ethernetConnected = (mConnectedNetworkType == ConnectivityManager.TYPE_ETHERNET); final boolean ethernetConnected = (mConnectedNetworkType == ConnectivityManager.TYPE_ETHERNET);
if (ethernetConnected) { if (ethernetConnected) {
// TODO: icons and strings for Ethernet connectivity combinedLabel = context.getString(R.string.ethernet_label);
combinedLabel = mConnectedNetworkTypeName;
} }
if (mAirplaneMode && if (mAirplaneMode &&