From 222a0936491be38de84b50f914b721c12630622a Mon Sep 17 00:00:00 2001
From: Andrew Flynn <flynn@google.com>
Date: Tue, 22 May 2012 10:54:54 -0700
Subject: [PATCH] resolved conflicts for merge of f89dc7c9 to master

Change-Id: Icd37261dd3ce920b3bed359ed5232bdc018916fc
---
 res/layout/wifi_wps_dialog.xml               | 7 +++++++
 res/values/strings.xml                       | 2 +-
 src/com/android/settings/wifi/WpsDialog.java | 1 -
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/res/layout/wifi_wps_dialog.xml b/res/layout/wifi_wps_dialog.xml
index 3594436389c..1c5713a915e 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 16c75e29276..c7458b146e3 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 up to 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 up to 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 6cf6867d12f..40b2a35b9c1 100644
--- a/src/com/android/settings/wifi/WpsDialog.java
+++ b/src/com/android/settings/wifi/WpsDialog.java
@@ -133,7 +133,6 @@ public class WpsDialog extends AlertDialog {
 
     @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);