Commit: 8c21955e135b7482936a7ce935afd2900767afdb - packages-apps-Settings (git)

packages/apps/Settings

Commit MetaInfo

• Revision: 8c21955e135b7482936a7ce935afd2900767afdb (tree)
• Time: 2016-10-05 05:26:38
• Author: Steve Kondik <steve@cyng...>
• Commiter: Steve Kondik

Log Message

Android 7.0.0 Release 14 (NBD90Z)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlfz9GEACgkQ6K0/gZqxDni5BwCeIWx4SeyHc0HHXoAEKBJ7WXdd
CY0AnifjYFPij2rKmkJgyyGycsBlynim
=eho9
-----END PGP SIGNATURE-----

Merge tag 'android-7.0.0_r14' of https://android.googlesource.com/platform/packages/apps/Settings into cm-14.0

Android 7.0.0 Release 14 (NBD90Z)

Change-Id: I82c1b165066d47989d012667de1391900f5774e9

Change Summary

• modified: src/com/android/settings/bluetooth/BluetoothSettings.java
• modified: src/com/android/settings/wifi/WifiSettings.java

Incremental Difference

--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -385,11 +385,10 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
                     messageId = R.string.bluetooth_empty_list_user_restricted;
                     break;
                 }
-                if (getPreferenceScreen().getPreferenceCount() == 0) {
-                    getPreferenceScreen().addPreference(mPairedDevicesCategory);
-                    getPreferenceScreen().addPreference(mAvailableDevicesCategory);
-                    getPreferenceScreen().addPreference(mMyDevicePreference);
-                }
+                getPreferenceScreen().removeAll();
+                getPreferenceScreen().addPreference(mPairedDevicesCategory);
+                getPreferenceScreen().addPreference(mAvailableDevicesCategory);
+                getPreferenceScreen().addPreference(mMyDevicePreference);
 
                 // Paired devices category
                 addDeviceCategory(mPairedDevicesCategory,

--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -43,6 +43,7 @@ import android.provider.Settings;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
 import android.text.Spannable;
+import android.text.TextUtils;
 import android.text.style.TextAppearanceSpan;
 import android.util.Log;
 import android.view.ContextMenu;
@@ -55,6 +56,7 @@ import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.TextView.BufferType;
 import android.widget.Toast;
+
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.logging.MetricsProto.MetricsEvent;
 import com.android.settings.LinkifyUtils;
@@ -114,6 +116,8 @@ public class WifiSettings extends RestrictedSettingsFragment
     private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state";
     private static final String SAVED_WIFI_NFC_DIALOG_STATE = "wifi_nfc_dlg_state";
 
+    private static final String PREF_KEY_EMPTY_WIFI_LIST = "wifi_empty_list";
+
     protected WifiManager mWifiManager;
     private WifiManager.ActionListener mConnectListener;
     private WifiManager.ActionListener mSaveListener;
@@ -647,7 +651,6 @@ public class WifiSettings extends RestrictedSettingsFragment
                 // AccessPoints are automatically sorted with TreeSet.
                 final Collection<AccessPoint> accessPoints =
                         mWifiTracker.getAccessPoints();
-                getPreferenceScreen().removeAll();
 
                 boolean hasAvailableAccessPoints = false;
                 int index = 0;
@@ -656,6 +659,9 @@ public class WifiSettings extends RestrictedSettingsFragment
                     // Ignore access points that are out of range.
                     if (accessPoint.getLevel() != -1) {
                         String key = accessPoint.getBssid();
+                        if (TextUtils.isEmpty(key)) {
+                            key = accessPoint.getSsidStr();
+                        }
                         hasAvailableAccessPoints = true;
                         LongPressAccessPointPreference pref = (LongPressAccessPointPreference)
                                 getCachedPreference(key);
@@ -693,6 +699,7 @@ public class WifiSettings extends RestrictedSettingsFragment
                     pref.setSelectable(false);
                     pref.setSummary(R.string.wifi_empty_list_wifi_on);
                     pref.setOrder(0);
+                    pref.setKey(PREF_KEY_EMPTY_WIFI_LIST);
                     getPreferenceScreen().addPreference(pref);
                     mAddPreference.setOrder(1);
                     getPreferenceScreen().addPreference(mAddPreference);
@@ -903,8 +910,19 @@ public class WifiSettings extends RestrictedSettingsFragment
     }
 
     @Override
-    public void onAccessPointChanged(AccessPoint accessPoint) {
-        ((LongPressAccessPointPreference) accessPoint.getTag()).refresh();
+    public void onAccessPointChanged(final AccessPoint accessPoint) {
+        View view = getView();
+        if (view != null) {
+            view.post(new Runnable() {
+                @Override
+                public void run() {
+                    Object tag = accessPoint.getTag();
+                    if (tag != null) {
+                        ((LongPressAccessPointPreference) tag).refresh();
+                    }
+                }
+            });
+        }
     }
 
     @Override