diff options
| author | xinhe <xinhe@google.com> | 2015-04-17 11:32:42 -0700 |
|---|---|---|
| committer | xinhe <xinhe@google.com> | 2015-04-17 16:13:26 -0700 |
| commit | e11aa6f445111ae65d7afbfc5be3c684bfa9b2ab (patch) | |
| tree | c11eb753e8c680ff1143a90a4399cece7bdd9e1b /res | |
| parent | 6fcb62fbda271536640e57ffa1972467ddef7bba (diff) | |
| download | packages_apps_Settings-e11aa6f445111ae65d7afbfc5be3c684bfa9b2ab.zip packages_apps_Settings-e11aa6f445111ae65d7afbfc5be3c684bfa9b2ab.tar.gz packages_apps_Settings-e11aa6f445111ae65d7afbfc5be3c684bfa9b2ab.tar.bz2 | |
Change SoftAP Setup UI
Bug:20140630
Change-Id: I7f5696a5b78c70a6bc8ac38c5b99dd408e06a668
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/wifi_ap_dialog.xml | 45 | ||||
| -rw-r--r-- | res/values/arrays.xml | 11 |
2 files changed, 32 insertions, 24 deletions
diff --git a/res/layout/wifi_ap_dialog.xml b/res/layout/wifi_ap_dialog.xml index 7a038cb..5452cd0 100644 --- a/res/layout/wifi_ap_dialog.xml +++ b/res/layout/wifi_ap_dialog.xml @@ -67,30 +67,6 @@ android:prompt="@string/wifi_security" android:entries="@array/wifi_ap_security" /> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="@style/wifi_item_label" - android:layout_marginTop="8dip" - android:text="@string/wifi_ap_band_config" /> - - <RadioGroup android:id = "@+id/choose_channel" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <RadioButton android:id="@+id/ap_2G_band" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_ap_choose_2G" - android:layout_marginTop="8dip"/> - - <RadioButton android:id="@+id/ap_5G_band" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/wifi_ap_choose_5G" - android:layout_marginTop="8dip"/> - </RadioGroup> </LinearLayout> <LinearLayout android:id="@+id/fields" @@ -130,5 +106,26 @@ style="@style/wifi_item_content" android:text="@string/wifi_show_password" /> </LinearLayout> + + <LinearLayout android:id="@+id/fields" + android:layout_width="match_parent" + android:layout_height="wrap_content" + style="@style/wifi_item" + android:orientation="vertical"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + style="@style/wifi_item_label" + android:layout_marginTop="8dip" + android:text="@string/wifi_ap_band_config" /> + + <Spinner android:id="@+id/choose_channel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + style="@style/wifi_item_content" + android:prompt="@string/wifi_ap_band_config" /> + </LinearLayout> + </LinearLayout> </ScrollView> diff --git a/res/values/arrays.xml b/res/values/arrays.xml index c108a21..49a0037 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -324,6 +324,17 @@ <item>AKA\'</item> </string-array> + <!-- Wi-Fi AP band settings. Either 2.4GHz or 5GHz. --> + <!-- Note that adding/removing/moving the items will need wifi settings code change. --> + <string-array name="wifi_ap_band_config_full"> + <item>@string/wifi_ap_choose_2G</item> + <item>@string/wifi_ap_choose_5G</item> + </string-array> + + <string-array name="wifi_ap_band_config_2G_only"> + <item>@string/wifi_ap_choose_2G</item> + </string-array> + <!-- Wi-Fi WPS setup for p2p connections. --> <!-- Note that adding/removing/moving the items will need wifi settings code change. --> <string-array name="wifi_p2p_wps_setup"> |