diff options
| author | Irfan Sheriff <isheriff@google.com> | 2010-06-03 11:13:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-03 11:13:21 -0700 |
| commit | a496684019497395b71c6d460501197a74e21e0e (patch) | |
| tree | 4372a8e824ea938708f30c7ce69ab4f5c00a757c /res/layout | |
| parent | 7c5717c0647bf31d0bf5a3b04971dabb4ee0a16c (diff) | |
| parent | de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1 (diff) | |
| download | packages_apps_Settings-a496684019497395b71c6d460501197a74e21e0e.zip packages_apps_Settings-a496684019497395b71c6d460501197a74e21e0e.tar.gz packages_apps_Settings-a496684019497395b71c6d460501197a74e21e0e.tar.bz2 | |
am de3e5665: Add phase2 authentication settings
Merge commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1' into froyo-plus-aosp
* commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1':
Add phase2 authentication settings
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/wifi_dialog.xml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml index 6558453..081ab6c 100644 --- a/res/layout/wifi_dialog.xml +++ b/res/layout/wifi_dialog.xml @@ -89,6 +89,19 @@ <TextView style="?android:attr/textAppearanceSmallInverse" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dip" + android:text="@string/please_select_phase2" /> + + <Spinner android:id="@+id/phase2" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:prompt="@string/please_select_phase2" + android:entries="@array/wifi_phase2_entries" /> + + <TextView + style="?android:attr/textAppearanceSmallInverse" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="4dip" |