diff options
| author | Etan Cohen <etancohen@google.com> | 2015-04-25 00:49:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-25 00:51:57 +0000 |
| commit | a0128ff0bfe0a21681c3f3686bc8a03547e74ca2 (patch) | |
| tree | 1eccd959cf9710452e84f4ff6d2037612409ddfb /res | |
| parent | 93564706e1255e649ecd3c6efc7f1c8fb0660bc7 (diff) | |
| parent | a09725c51373161d9a5a70407cf228e8be844a1c (diff) | |
| download | packages_apps_Settings-a0128ff0bfe0a21681c3f3686bc8a03547e74ca2.zip packages_apps_Settings-a0128ff0bfe0a21681c3f3686bc8a03547e74ca2.tar.gz packages_apps_Settings-a0128ff0bfe0a21681c3f3686bc8a03547e74ca2.tar.bz2 | |
Merge changes from topic 'mwd-merge-042415'
* changes:
Merge commit '377c7c9' into merge2
Merge commit '22ffff6' into merge2
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 16f1970..032382e 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"> |