Merge "Update WPS Dialog" into jb-dev
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"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dbd5f90..e1ca016 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1239,7 +1239,7 @@
<!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
<string name="wifi_wps_setup_msg">Starting WPS\u2026</string>
<!-- Message in WPS dialog for PBC after start up [CHAR LIMIT=150] -->
- <string name="wifi_wps_onstart_pbc">Push the WPS button on your Wi-Fi router. The setup can take upto two minutes to complete.</string>
+ <string name="wifi_wps_onstart_pbc">Press the Wi-Fi Protected Setup button on your router. It may be called \"WPS\" or contain this symbol:</string>
<!-- Message in WPS dialog for PIN after start up [CHAR LIMIT=150] -->
<string name="wifi_wps_onstart_pin">Enter pin <xliff:g id="number">%1$s</xliff:g> on your Wi-Fi router. The setup can take upto two minutes to complete.</string>
<!-- Text displayed when WPS succeeds [CHAR LIMIT=150] -->
diff --git a/src/com/android/settings/wifi/WpsDialog.java b/src/com/android/settings/wifi/WpsDialog.java
index 6cf6867..40b2a35 100644
--- a/src/com/android/settings/wifi/WpsDialog.java
+++ b/src/com/android/settings/wifi/WpsDialog.java
@@ -133,7 +133,6 @@
@Override
protected void onCreate(Bundle savedInstanceState) {
- setTitle(R.string.wifi_wps_setup_title);
mView = getLayoutInflater().inflate(R.layout.wifi_wps_dialog, null);
mTextView = (TextView) mView.findViewById(R.id.wps_dialog_txt);