From cb3dfb91e8e573a0cd0689c3e315713f63f3f3ee 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 Merged-In: I5f4131c6a86eab6c0fb03ea2b5101ba107a9189f Change-Id: I5f4131c6a86eab6c0fb03ea2b5101ba107a9189f --- res/values/strings.xml | 6 + .../settings/wifi/ConfigureWifiSettings.java | 17 ++- .../wifi/UseOpenWifiPreferenceController.java | 42 ++++++- .../wifi/WifiWakeupPreferenceController.java | 20 +++- .../UseOpenWifiPreferenceControllerTest.java | 103 +++++++++++++----- .../WifiWakeupPreferenceControllerTest.java | 25 ++++- 6 files changed, 168 insertions(+), 45 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 902870de8f2..031682c6f06 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1700,6 +1700,8 @@ Wi\u2011Fi will turn back on near high\u2011quality saved networks, like your home network Unavailable because Wi\u2011Fi scanning is turned off + + To use, select a network rating provider Avoid poor connections @@ -1710,6 +1712,10 @@ Connect to open networks Automatically connect to high\u2011quality public networks + + To use, select a network rating provider + + To use, select a compatible network rating provider Install certificates