PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am be4a0325: Merge "Update WPS Dialog" into jb-dev

Browse Source 
* commit 'be4a032581ae6dfb41662486085e64052d085314':
  Update WPS Dialog
This commit is contained in:
Andrew Flynn
2012-05-22 11:41:21 -07:00
committed by Android Git Automerger
parent 33089ad705 be4a032581
commit f89dc7c93a
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
res/layout/wifi_wps_dialog.xml
View File

@@ -30,6 +30,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dip" /> 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 <ProgressBar
android:id="@+id/wps_timeout_bar" android:id="@+id/wps_timeout_bar"
android:layout_width="match_parent" android:layout_width="match_parent"

2
res/values/strings.xml
View File

@@ -1239,7 +1239,7 @@
<!-- Message in WPS dialog at start up [CHAR LIMIT=150] --> <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
<string name="wifi_wps_setup_msg">Starting WPS\u2026</string> <string name="wifi_wps_setup_msg">Starting WPS\u2026</string>
<!-- Message in WPS dialog for PBC after start up [CHAR LIMIT=150] --> <!-- 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] --> <!-- 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> <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] --> <!-- Text displayed when WPS succeeds [CHAR LIMIT=150] -->

1
src/com/android/settings/wifi/WpsDialog.java
View File

@@ -133,7 +133,6 @@ public class WpsDialog extends AlertDialog {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
setTitle(R.string.wifi_wps_setup_title);
mView = getLayoutInflater().inflate(R.layout.wifi_wps_dialog, null); mView = getLayoutInflater().inflate(R.layout.wifi_wps_dialog, null);
mTextView = (TextView) mView.findViewById(R.id.wps_dialog_txt); mTextView = (TextView) mView.findViewById(R.id.wps_dialog_txt);