diff options
author | Chong Zhang <chz@google.com> | 2013-06-04 18:38:07 -0700 |
---|---|---|
committer | Chong Zhang <chz@google.com> | 2013-06-06 15:50:57 -0700 |
commit | 017d82af8a978cf20a848f5698840f4661aae3ea (patch) | |
tree | bc8caa056a046a235e1fc5021b5fca96f41e10b4 /src/com/android/settings/wfd | |
parent | d28c849e435356a42a4232a1d13da7ba9183d53c (diff) | |
download | packages_apps_Settings-017d82af8a978cf20a848f5698840f4661aae3ea.zip packages_apps_Settings-017d82af8a978cf20a848f5698840f4661aae3ea.tar.gz packages_apps_Settings-017d82af8a978cf20a848f5698840f4661aae3ea.tar.bz2 |
wifi-display: grey out display if it's unavailable
Bug 9229799
Change-Id: I981423257a6ddff9deaea7f8339944cf46c1a0ba
Diffstat (limited to 'src/com/android/settings/wfd')
-rwxr-xr-x | src/com/android/settings/wfd/WifiDisplaySettings.java | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/com/android/settings/wfd/WifiDisplaySettings.java b/src/com/android/settings/wfd/WifiDisplaySettings.java index 5b732d6..ca2d254 100755 --- a/src/com/android/settings/wfd/WifiDisplaySettings.java +++ b/src/com/android/settings/wfd/WifiDisplaySettings.java @@ -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); |