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

Commit 0c0fc19a authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Use Collator to sort saved networks. 

Bug: 36570745
Test: m RunSettingsRoboTests && manually checking Saved networks
Change-Id: I58bfc07c8456746bba88bffdc9c6c7df8650e012
parent b26ce1e1

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

+15 −9
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.settings.wifi; 
import android.app.Dialog;

import android.content.Context;

import android.content.res.Resources;

import android.icu.text.Collator;

import android.net.wifi.WifiManager;

import android.os.Bundle;

import android.provider.SearchIndexableResource;
@@ -49,6 +50,19 @@ import java.util.List; 
public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment

        implements Indexable, WifiDialog.WifiDialogListener {

    private static final String TAG = "SavedAccessPointsWifiSettings";

    private static final Comparator<AccessPoint> SAVED_NETWORK_COMPARATOR =

            new Comparator<AccessPoint>() {

        final Collator mCollator = Collator.getInstance();

        @Override

        public int compare(AccessPoint ap1, AccessPoint ap2) {

            return mCollator.compare(

                    nullToEmpty(ap1.getConfigName()), nullToEmpty(ap2.getConfigName()));

        }



        private String nullToEmpty(String string) {

            return (string == null) ? "" : string;

        }

    };



    private WifiDialog mDialog;

    private WifiManager mWifiManager;
@@ -98,15 +112,7 @@ public class SavedAccessPointsWifiSettings extends SettingsPreferenceFragment 


        final List<AccessPoint> accessPoints = WifiTracker.getCurrentAccessPoints(context, true,

                false, true);

        Collections.sort(accessPoints, new Comparator<AccessPoint>() {

            public int compare(AccessPoint ap1, AccessPoint ap2) {

                if (ap1.getConfigName() != null) {

                    return ap1.getConfigName().compareToIgnoreCase(ap2.getConfigName());

                } else {

                    return -1;

                }

            }

        });

        Collections.sort(accessPoints, SAVED_NETWORK_COMPARATOR);

        preferenceScreen.removeAll();



        final int accessPointsSize = accessPoints.size();