am 7b17e24d: am a9086ee9: Show accurate connection status for ephemeral networks...

* commit '7b17e24d36e5fd3263204a4ee666e85a4a006b90':
  Show accurate connection status for ephemeral networks.

diff --cc res/values/strings.xml
index 4ab2034,fbf37ab..c9f6984
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -1503,12 -1503,10 +1503,14 @@@
      <string name="wifi_menu_scan">Scan</string>
      <!-- Menu option to Wi-Fi advanced settings -->
      <string name="wifi_menu_advanced">Advanced</string>
 +    <!-- Menu option to show app icons instead of WiFi strength [CHAR LIMIT=20]-->
 +    <string name="wifi_menu_apps">Show Apps</string>
 +    <!-- Menu option to show WiFi strength icons [CHAR LIMIT=20]-->
 +    <string name="wifi_menu_apps_strength">Show WiFi Strength</string>
      <!-- Menu option to connect to a Wi-Fi network -->
      <string name="wifi_menu_connect">Connect to network</string>
+     <!-- Menu option to remember a temporary Wi-Fi network -->
+     <string name="wifi_menu_remember">Remember network</string>
      <!-- Menu option to delete a Wi-Fi network -->
      <string name="wifi_menu_forget">Forget network</string>
      <!-- Menu option to modify a Wi-Fi network configuration -->

diff --cc src/com/android/settings/wifi/AccessPoint.java
index 6a9b8f6,6b6175e..d5d3c66
--- 1/src/com/android/settings/wifi/AccessPoint.java
--- 2/src/com/android/settings/wifi/AccessPoint.java
+++ b/src/com/android/settings/wifi/AccessPoint.java
@@@ -19,11 -19,11 +19,13 @@@ package com.android.settings.wifi
  import com.android.settings.R;
  
  import android.content.Context;
 +import android.content.pm.PackageManager;
 +import android.content.pm.PackageManager.NameNotFoundException;
  import android.graphics.drawable.Drawable;
  import android.graphics.drawable.StateListDrawable;
+ import android.net.NetworkInfo;
  import android.net.NetworkInfo.DetailedState;
+ import android.net.NetworkInfo.State;
  import android.net.wifi.ScanResult;
  import android.net.wifi.WifiConfiguration;
  import android.net.wifi.WifiConfiguration.KeyMgmt;

diff --cc src/com/android/settings/wifi/WifiSettings.java
index a4bbc58,76ebcca..b5a9018
--- 1/src/com/android/settings/wifi/WifiSettings.java
--- 2/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@@ -544,12 -530,27 +545,25 @@@ public class WifiSettings extends Restr
              if (preference instanceof AccessPoint) {
                  mSelectedAccessPoint = (AccessPoint) preference;
                  menu.setHeaderTitle(mSelectedAccessPoint.ssid);
-                 if (mSelectedAccessPoint.getLevel() != -1
-                         && mSelectedAccessPoint.getState() == null) {
-                     menu.add(Menu.NONE, MENU_ID_CONNECT, 0, R.string.wifi_menu_connect);
+                 if (mSelectedAccessPoint.getLevel() != -1) {
+                     int connectStringRes = 0;
+                     if (mSelectedAccessPoint.getState() == null) {
+                         connectStringRes = R.string.wifi_menu_connect;
+                     } else if (mSelectedAccessPoint.networkId == INVALID_NETWORK_ID &&
+                             mSelectedAccessPoint.getNetworkInfo().getState()
+                                 != State.DISCONNECTED) {
+                         // State is non-null (and not disconnected) but this network has no
+                         // configuration, which means it is ephemeral. Allow the user to save the
+                         // configuration permanently (but still issue this as a CONNECT command).
+                         connectStringRes = R.string.wifi_menu_remember;
+                     }
+ 
+                     if (connectStringRes != 0) {
+                         menu.add(Menu.NONE, MENU_ID_CONNECT, 0, connectStringRes);
+                     }
                  }
                  if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
 -                    if (ActivityManager.getCurrentUser() == UserHandle.USER_OWNER) {
 -                        menu.add(Menu.NONE, MENU_ID_FORGET, 0, R.string.wifi_menu_forget);
 -                    }
 +                    menu.add(Menu.NONE, MENU_ID_FORGET, 0, R.string.wifi_menu_forget);
                      menu.add(Menu.NONE, MENU_ID_MODIFY, 0, R.string.wifi_menu_modify);
  
                      if (mSelectedAccessPoint.security != AccessPoint.SECURITY_NONE) {