PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wifi-display: change string to "In use" instead of "Busy"

Browse Source 
Bug 9229799

Change-Id: Id87987812e3d65ef2a2196668f5d67b4417368d3
This commit is contained in:
Chong Zhang
2013-06-07 10:29:34 -07:00
parent fbc39830ec
commit 5e1367f63a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -1221,8 +1221,8 @@
<string name="wifi_display_status_connected">Connected</string> <string name="wifi_display_status_connected">Connected</string>
<!-- Wifi Display settings. The status summary for available devices. [CHAR LIMIT=40] --> <!-- Wifi Display settings. The status summary for available devices. [CHAR LIMIT=40] -->
<string name="wifi_display_status_available">Available</string> <string name="wifi_display_status_available">Available</string>
<!-- Wifi Display settings. The status summary for busy devices. [CHAR LIMIT=40] --> <!-- Wifi Display settings. The status summary for devices that's already in use. [CHAR LIMIT=40] -->
<string name="wifi_display_status_busy">Busy</string> <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. --> <!-- 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> <string name="wifi_display_details">Display settings</string>

4
src/com/android/settings/wfd/WifiDisplaySettings.java
View File

@@ -270,13 +270,13 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
for (WifiDisplay display : mWifiDisplayStatus.getAvailableDisplays()) { for (WifiDisplay display : mWifiDisplayStatus.getAvailableDisplays()) {
if (display.getDeviceAddress().equals(d.getDeviceAddress()) && if (display.getDeviceAddress().equals(d.getDeviceAddress()) &&
!display.canConnect()) { !display.canConnect()) {
p.setSummary(R.string.wifi_display_status_busy); p.setSummary(R.string.wifi_display_status_in_use);
p.setEnabled(false); p.setEnabled(false);
break; break;
} }
} }
} else if (!paired && !d.canConnect()) { } 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); p.setEnabled(false);
} }
if (paired) { if (paired) {