From 7e27006a7bc8162b535aecb69cf2e5872bb19d77 Mon Sep 17 00:00:00 2001 From: Stephen Chen Date: Fri, 23 Jun 2017 15:14:14 -0700 Subject: [PATCH] Adjust UX for toggles when active scorer is not set. This change fixes two issues: when wakeup is not available, update the number of items to show above the fold in wifi preferences. When scorer is not set, grey out wakeup toggle and set summary to reflect the status. Bug: 62410973 Bug: 62343859 Test: make RunSettingsRoboTests -j40 Change-Id: I5f4131c6a86eab6c0fb03ea2b5101ba107a9189f --- res/values/strings.xml | 3 + .../settings/wifi/ConfigureWifiSettings.java | 16 ++- .../wifi/UseOpenWifiPreferenceController.java | 42 ++++++- .../wifi/WifiWakeupPreferenceController.java | 22 +++- .../UseOpenWifiPreferenceControllerTest.java | 103 +++++++++++++----- .../WifiWakeupPreferenceControllerTest.java | 25 ++++- 6 files changed, 166 insertions(+), 45 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 2c58aae0ae1..46735e6b158 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1708,6 +1708,7 @@ Wi\u2011Fi will turn back on near high\u2011quality saved networks, like your home network Unavailable because Wi\u2011Fi scanning is turned off + Unavailable because network rating provider is set to none Avoid poor connections @@ -1718,6 +1719,8 @@ Connect to open networks Automatically connect to high\u2011quality public networks + Unavailable because network rating provider is set to none + Unavailable because the network rating provider does not support this feature Install certificates