Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b963c119 authored by Sundeep Ghuman's avatar Sundeep Ghuman Committed by android-build-merger
Browse files

Merge "Don't scroll when removing saved networks." into oc-dr1-dev 

am: 1e561edb

Change-Id: I9fa78596bdcbaeac90aaee55ddcde3f698ad907f
parents 8e1c3b9b 1e561edb

src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java

+14 −6
Original line number Diff line number Diff line
@@ -127,16 +127,24 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment 
        final List<AccessPoint> accessPoints =

                WifiSavedConfigUtils.getAllConfigs(context, mWifiManager);

        Collections.sort(accessPoints, SAVED_NETWORK_COMPARATOR);

        preferenceScreen.removeAll();

        cacheRemoveAllPrefs(preferenceScreen);



        final int accessPointsSize = accessPoints.size();

        for (int i = 0; i < accessPointsSize; ++i) {

            AccessPoint ap = accessPoints.get(i);

            String key = AccessPointPreference.generatePreferenceKey(ap);

            LongPressAccessPointPreference preference =

                    new LongPressAccessPointPreference(accessPoints.get(i), context,

                            mUserBadgeCache, true, this);

                    (LongPressAccessPointPreference) getCachedPreference(key);

            if (preference == null) {

                preference = new LongPressAccessPointPreference(

                        ap, context, mUserBadgeCache, true, this);

                preference.setKey(key);

                preference.setIcon(null);

                preferenceScreen.addPreference(preference);

            }

        }



        removeCachedPrefs(preferenceScreen);



        if(getPreferenceScreen().getPreferenceCount() < 1) {

            Log.w(TAG, "Saved networks activity loaded, but there are no saved networks!");

src/com/android/settings/wifi/WifiSettings.java

+1 −14
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.provider.Settings; 
import android.support.annotation.VisibleForTesting;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceCategory;

import android.text.TextUtils;

import android.util.Log;

import android.view.ContextMenu;

import android.view.ContextMenu.ContextMenuInfo;
@@ -735,7 +734,7 @@ public class WifiSettings extends RestrictedSettingsFragment 
            AccessPoint accessPoint = accessPoints.get(index);

            // Ignore access points that are out of range.

            if (accessPoint.isReachable()) {

                String key = generateKey(accessPoint);

                String key = AccessPointPreference.generatePreferenceKey(accessPoint);

                hasAvailableAccessPoints = true;

                LongPressAccessPointPreference pref =

                        (LongPressAccessPointPreference) getCachedPreference(key);
@@ -777,18 +776,6 @@ public class WifiSettings extends RestrictedSettingsFragment 
        }

    }



    private String generateKey(AccessPoint accessPoint) {

        StringBuilder key = new StringBuilder();

        String bssid = accessPoint.getBssid();

        if (TextUtils.isEmpty(bssid)) {

            key.append(accessPoint.getSsidStr());

        } else {

            key.append(bssid);

        }

        key.append(',').append(accessPoint.getSecurity());

        return key.toString();

    }



    @NonNull

    private LongPressAccessPointPreference createLongPressActionPointPreference(

            AccessPoint accessPoint) {