Refactor WiFi code around XL setup
Major:
- move SetupWizard-related codes to WifiSettingsForSetupWizardXL as
much as possible
- stop using Preference for configurinig wifi network. We use
WifiConfigUiForSetupWizardXL instead, which is base on a bare View.
Minor:
- change button handling code expecting better readability.
- hide Detail button.
- modify strings a bit.
- add logs
Bug: 3175016
Change-Id: I5b29917af73aac6a82e13ba846a9d5085f9bd523
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1e843e3..2d09282 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1009,12 +1009,6 @@
<string name="wifi_save">Save</string>
<!-- Button label to dismiss the dialog -->
<string name="wifi_cancel">Cancel</string>
- <!-- Button label to go back to previous screen. Used in SetupWizard for
- XLarge screen [CHAR LIMIT=10]-->
- <string name="wifi_back">Back</string>
- <!-- Button label to show detailed dialog for WiFi settings.
- Used in SetupWizard for XLarge screen [CHAR LIMIT=10]-->
- <string name="wifi_detail">Detail</string>
<!-- Wi-Fi Advanced Settings --> <skip />
<!-- Wi-Fi settings screen, advanced, settings section. This is a header shown above advanced wifi settings. -->
@@ -2953,13 +2947,31 @@
<!-- Button message shown on the button enabling users go the next step.
Used in Wifi Setup For Setup Wizard with XL screen. -->
<string name="wifi_setup_next">Next</string>
+ <!-- Button label to go back to previous screen. Used in SetupWizard for
+ XLarge screen [CHAR LIMIT=10] -->
+ <string name="wifi_setup_back">Back</string>
+ <!-- Button label to show detailed dialog for a selected WiFi settings.
+ Used in SetupWizard for XLarge screen [CHAR LIMIT=20] -->
+ <string name="wifi_setup_detail">Network details</string>
+ <!-- Button label to connect to a Wi-Fi network.
+ Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+ <string name="wifi_setup_connect">Connect</string>
+ <!-- Button label to delete a Wi-Fi network.
+ Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+ <string name="wifi_setup_forget">Forget</string>
+ <!-- Button label to save a Wi-Fi network configuration.
+ Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+ <string name="wifi_setup_save">Save</string>
+ <!-- Button label to dismiss the dialog.
+ Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+ <string name="wifi_setup_cancel">Cancel</string>
<!-- The message shown above available networks when the device is scanning
available networks [CHAR LIMIT=35] -->
<string name="wifi_setup_status_scanning">Scanning networks...</string>
<!-- Message shown above available network when there's no connected network.
Used in Wifi Setup For Setup Wizard with XL screen. -->
- <string name="wifi_setup_status_select_network">Touch to select network</string>
+ <string name="wifi_setup_status_select_network">Touch a network to connect to it</string>
<!-- Message shown above available networks when a user clicked one of available
networks and the UI is showing one possible existing network.
Used in Wifi Setup. -->