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

wifi-display: grey out display if it's unavailable

Browse Source 
Bug 9229799

Change-Id: I981423257a6ddff9deaea7f8339944cf46c1a0ba
This commit is contained in:
Chong Zhang
2013-06-04 18:38:07 -07:00
parent d28c849e43
commit 017d82af8a
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -1221,6 +1221,8 @@
<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. 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>

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

@@ -182,7 +182,7 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
if (display.equals(mWifiDisplayStatus.getActiveDisplay())) {
showDisconnectDialog(display);
} else {
} else if (display.canConnect()){
mDisplayManager.connectWifiDisplay(display.getDeviceAddress());
}
}
@@ -267,6 +267,17 @@ public final class WifiDisplaySettings extends SettingsPreferenceFragment {
} else if (paired && contains(mWifiDisplayStatus.getAvailableDisplays(),
d.getDeviceAddress())) {
p.setSummary(R.string.wifi_display_status_available);
for (WifiDisplay display : mWifiDisplayStatus.getAvailableDisplays()) {
if (display.getDeviceAddress().equals(d.getDeviceAddress()) &&
!display.canConnect()) {
p.setSummary(R.string.wifi_display_status_busy);
p.setEnabled(false);
break;
}
}
} else if (!paired && !d.canConnect()) {
p.setSummary(R.string.wifi_display_status_busy);
p.setEnabled(false);
}
if (paired) {
p.setWidgetLayoutResource(R.layout.wifi_display_preference);