commit 1638168336d1b5e9c2b77859dacbb7f19b2462e2
author Hai Shalom <haishalom@google.com> Tue Nov 13 16:37:24 2018 -0800
committer Hai Shalom <haishalom@google.com> Wed Nov 21 18:58:38 2018 -0800
tree fdb6643534bfc35bda3a8a26359738ca1d0ef842
parent f611fe86892a244b99cda9b555fd8b716576b6af

[WPA3] Filter unsupported networks from Add network spinner

Filter unsupported networks from Add network spinner. Removed entries
from wifi_dialog.xml, adding them dynamically based on device
capabilities. Adding position-to-security table, that decouples spinner
positions from security values.

Bug: 112195778
Test: atest WifiConfigControllerTest + device functional test
Change-Id: I6a814c4d69fbd8d8076db5dbaa5da807b4da4c32

res/layout/wifi_dialog.xml

diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index 72eb011..bb2946d 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -83,12 +83,13 @@
                         style="@style/wifi_item_label"
                         android:text="@string/wifi_security" />
 
+                <!-- Entries are added dynamically to this spinner -->
+                <!-- See WifiConfigController.configureSecuritySpinner -->
                 <Spinner android:id="@+id/security"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         style="@style/wifi_item_spinner"
-                        android:prompt="@string/wifi_security"
-                        android:entries="@array/wifi_security" />
+                        android:prompt="@string/wifi_security" />
             </LinearLayout>
         </LinearLayout>