Merge "Write wifi config to NFC tag"

2 files changed, 63 insertions, 0 deletions

diff --git a/res/layout/write_wifi_config_to_nfc.xml b/res/layout/write_wifi_config_to_nfc.xml
new file mode 100644
index 0000000..416c1ae
--- /dev/null
+++ b/res/layout/write_wifi_config_to_nfc.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+            style="@style/wifi_section">
+
+    <LinearLayout android:id="@+id/password_layout"
+                  style="@style/wifi_item"
+                  android:padding="8dip"
+                  android:orientation="vertical" >
+
+        <TextView
+                android:id="@+id/password_label"
+                android:layout_gravity="fill"
+                style="@style/wifi_item_label"
+                android:text="@string/wifi_password" />
+
+        <EditText android:id="@+id/password"
+                  style="@style/wifi_item_edit_content"
+                  android:singleLine="true"
+                  android:password="true" />
+
+        <TextView
+                style="@style/wifi_item_label" />
+
+        <CheckBox android:id="@+id/show_password"
+                  style="@style/wifi_item_content"
+                  android:textSize="14sp"
+                  android:text="@string/wifi_show_password" />
+
+    </LinearLayout>
+
+
+    <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical|center_horizontal"
+            android:padding="8dip"
+            android:visibility="gone"
+            style="@android:style/Widget.ProgressBar.Large" />
+
+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7ad8f8e..2fb21f7 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1494,6 +1494,8 @@
     <!-- Substring of wifi status for wifi with authentication.  This version is for when the
          string is not first in the list (lowercase in english) -->
     <string name="wifi_secured_second_item">, secured with <xliff:g id="wifi_security_short">%1$s</xliff:g></string>
+    <!-- Message in WriteWifiConfigToNfcDialog when prompted to enter network password [CHAR LIMIT=150] -->
+    <string name="wifi_wps_nfc_enter_password">Enter your network password.</string>
 
     <!-- Do not translate.  Concise terminology for wifi with WEP security -->
     <string name="wifi_security_short_wep">WEP</string>
@@ -5059,4 +5061,23 @@
     <!-- [CHAR LIMIT=NONE] Content description for per-app notification
          settings button -->
     <string name="notification_app_settings_button">Notification settings</string>
+
+    <!-- NFC WiFi pairing/setup strings-->
+
+    <!-- Write NFC tag for WiFi pairing/setup title -->
+    <string name="setup_wifi_nfc_tag">Set up WiFi NFC Tag</string>
+    <!-- Text for button to confirm writing tag -->
+    <string name="write_tag">Write</string>
+    <!-- Text to inform the user to tap a tag to complete the setup process -->
+    <string name="status_awaiting_tap">Tap a tag to write...</string>
+    <!-- Text to inform the user that the network key entered was incorrect -->
+    <string name="status_invalid_password">Invalid password, try again.</string>
+    <!-- Text displayed when tag successfully writen -->
+    <string name="status_write_success">Success!</string>
+    <!-- Text displayed in error cases (failure to write to tag) -->
+    <string name="status_failed_to_write">Unable to write data to NFC tag. If the problem persists, try a different tag</string>
+    <!-- Text displayed when tag is not writable -->
+    <string name="status_tag_not_writable">NFC tag is not writable. Please use a different tag.</string>
+
+
 </resources>