From b212629d92491dc4d44854298301717e6acd66e0 Mon Sep 17 00:00:00 2001
From: Sanket Padawe <sanketpadawe@google.com>
Date: Tue, 12 May 2015 10:26:43 -0700
Subject: [PATCH] Hotspot 2.0 UI for saved network.

Bug: 20182930
Change-Id: I455773f446dad323ed9cb559c2f2d69ca53af46c
---
 res/values/strings.xml                                  | 4 ++++
 src/com/android/settings/wifi/WifiConfigController.java | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7aee58ae935..f14a9dc83af 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1531,6 +1531,10 @@
     <string name="wifi_ip_address">IP address</string>
     <!-- Hint text for the IP address -->
     <string name="wifi_ip_address_hint" translatable="false">192.168.1.128</string>
+    <!-- Label for Passpoint network -->
+    <string name="passpoint_label">Saved via</string>
+    <!-- Content for Passpoint network -->
+    <string name="passpoint_content"><xliff:g id="name">%1$s</xliff:g> credentials</string>
     <!-- Label for the EAP method of the network -->
     <string name="wifi_eap_method">EAP method</string>
     <!-- Label for the phase2 -->
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 8988495c6d3..916af01fe4b 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -224,6 +224,10 @@ public class WifiConfigController implements TextWatcher,
                 } else {
                     mProxySettingsSpinner.setSelection(PROXY_NONE);
                 }
+                if (config != null && config.isPasspoint()) {
+                    addRow(group, R.string.passpoint_label, String.format(
+                        mContext.getString(R.string.passpoint_content), config.providerFriendlyName));
+                }
             }
 
             if ((!mAccessPoint.isSaved() && !mAccessPoint.isActive())