diff options
| author | Etan Cohen <etancohen@google.com> | 2015-04-24 14:39:03 -0700 |
|---|---|---|
| committer | Etan Cohen <etancohen@google.com> | 2015-04-24 14:39:03 -0700 |
| commit | a09725c51373161d9a5a70407cf228e8be844a1c (patch) | |
| tree | 473fe97bb5544240b23e5c8604dacbbb174587dd /res/layout | |
| parent | 6b7c383bd04290ca14ef348e198f0f22337c6b2f (diff) | |
| parent | 377c7c9afa2b1b827ba10a67185c5c2248e3e7df (diff) | |
| download | packages_apps_Settings-a09725c51373161d9a5a70407cf228e8be844a1c.tar.gz packages_apps_Settings-a09725c51373161d9a5a70407cf228e8be844a1c.tar.bz2 packages_apps_Settings-a09725c51373161d9a5a70407cf228e8be844a1c.zip | |
Merge commit '377c7c9' into merge2
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/wifi_ap_dialog.xml | 45 |
1 files changed, 21 insertions, 24 deletions
diff --git a/res/layout/wifi_ap_dialog.xml b/res/layout/wifi_ap_dialog.xml index 7a038cb1b..5452cd03a 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> |