OSDN Git Service

wifi-display: change string to "In use" instead of "Busy"
authorChong Zhang <chz@google.com>
Fri, 7 Jun 2013 17:29:34 +0000 (10:29 -0700)
committerChong Zhang <chz@google.com>
Fri, 7 Jun 2013 17:29:34 +0000 (10:29 -0700)
Bug 9229799

Change-Id: Id87987812e3d65ef2a2196668f5d67b4417368d3

res/values/strings.xml
src/com/android/settings/wfd/WifiDisplaySettings.java

index 965c1ad..068bdb9 100644 (file)
     <string name="wifi_display_status_connected">Connected</string>
     <!-- Wifi Display settings. The status summary for available devices. [CHAR LIMIT=40] -->
     <string name="wifi_display_status_available">Available</string>
-    <!-- Wifi Display settings. The status summary for busy devices. [CHAR LIMIT=40] -->
-    <string name="wifi_display_status_busy">Busy</string>
+    <!-- Wifi Display settings. The status summary for devices that's already in use. [CHAR LIMIT=40] -->
+    <string name="wifi_display_status_in_use">In use</string>
     <!-- Wifi Display settings. Image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
     <string name="wifi_display_details">Display settings</string>
 
index ca2d254..34d16d9 100755 (executable)
@@ -270,13 +270,13 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
             for (WifiDisplay display : mWifiDisplayStatus.getAvailableDisplays()) {
                 if (display.getDeviceAddress().equals(d.getDeviceAddress()) &&
                         !display.canConnect()) {
-                    p.setSummary(R.string.wifi_display_status_busy);
+                    p.setSummary(R.string.wifi_display_status_in_use);
                     p.setEnabled(false);
                     break;
                 }
             }
         } else if (!paired && !d.canConnect()) {
-            p.setSummary(R.string.wifi_display_status_busy);
+            p.setSummary(R.string.wifi_display_status_in_use);
             p.setEnabled(false);
         }
         if (paired) {