Merge "Hotspot 2.0 UI for saved network." into mnc-dev

2015-05-14 02:40:36 +00:00
parent ecac0e5590 b212629d92
commit b331c3937d
2 changed files with 8 additions and 0 deletions
--- 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())