diff options
| author | Andrew Flynn <flynn@google.com> | 2012-05-22 10:54:54 -0700 |
|---|---|---|
| committer | Andrew Flynn <flynn@google.com> | 2012-05-22 14:15:20 -0700 |
| commit | 222a0936491be38de84b50f914b721c12630622a (patch) | |
| tree | 1752bf92ca860ff302601e699162d2a84137d00e /res/layout/wifi_wps_dialog.xml | |
| parent | 2be0928f66c56214eaa6f139f6e6661b080a63d2 (diff) | |
| download | packages_apps_Settings-222a0936491be38de84b50f914b721c12630622a.zip packages_apps_Settings-222a0936491be38de84b50f914b721c12630622a.tar.gz packages_apps_Settings-222a0936491be38de84b50f914b721c12630622a.tar.bz2 | |
resolved conflicts for merge of f89dc7c9 to master
Change-Id: Icd37261dd3ce920b3bed359ed5232bdc018916fc
Diffstat (limited to 'res/layout/wifi_wps_dialog.xml')
| -rw-r--r-- | res/layout/wifi_wps_dialog.xml | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/res/layout/wifi_wps_dialog.xml b/res/layout/wifi_wps_dialog.xml index 3594436..1c5713a 100644 --- a/res/layout/wifi_wps_dialog.xml +++ b/res/layout/wifi_wps_dialog.xml @@ -30,6 +30,13 @@ android:layout_height="wrap_content" android:layout_marginTop="8dip" /> + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:layout_marginTop="8dip" + android:src="@drawable/ic_wps" /> + <ProgressBar android:id="@+id/wps_timeout_bar" android:layout_width="match_parent" |