PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Saved networks summary strings.

Browse Source 
Bug: 20667217
Change-Id: I13930f8d0d99bc874692568de713003798b98a87
This commit is contained in:
Sanket Padawe
2015-05-04 18:14:33 -07:00
parent a283e6e325
commit eb3ff59333
2 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/wifi/AccessPointPreference.java
View File

@@ -21,7 +21,6 @@ import android.graphics.drawable.StateListDrawable;
import android.preference.Preference;
import android.view.View;
import android.widget.TextView;
import com.android.settings.R;
import com.android.settingslib.wifi.AccessPoint;
@@ -81,7 +80,11 @@ public class AccessPointPreference extends Preference {
? STATE_SECURED
: STATE_NONE);
drawable = sld.getCurrent();
setIcon(drawable);
if (!mForSavedNetworks) {
setIcon(drawable);
} else {
setIcon(null);
}
}
}

35
src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
View File

@@ -41,6 +41,8 @@ import com.android.settings.search.Indexable;
import com.android.settings.search.SearchIndexableRaw;
import com.android.settingslib.wifi.AccessPoint;
import com.android.settingslib.wifi.WifiTracker;
import java.util.Collections;
import java.util.Comparator;
import java.util.ArrayList;
import java.util.List;
@@ -97,35 +99,22 @@ 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().compareTo(ap2.getConfigName());
} else {
return -1;
}
}
});
preferenceScreen.removeAll();
PackageManager pm = context.getPackageManager();
String systemName = pm.getNameForUid(android.os.Process.SYSTEM_UID);
final int accessPointsSize = accessPoints.size();
for (int i = 0; i < accessPointsSize; ++i){
AccessPointPreference preference = new AccessPointPreference(accessPoints.get(i),
context, true);
WifiConfiguration config = accessPoints.get(i).getConfig();
if (config != null) {
int userId = UserHandle.getUserId(config.creatorUid);
ApplicationInfo appInfo = null;
if (config.creatorName != null && config.creatorName.equals(systemName)) {
appInfo = context.getApplicationInfo();
} else {
try {
IPackageManager ipm = AppGlobals.getPackageManager();
appInfo = ipm.getApplicationInfo(config.creatorName, 0 /* flags */, userId);
} catch (RemoteException rex) {
}
}
if (appInfo != null) {
preference.setSummary(getResources().getString(appInfo.labelRes));
}
} else {
preference.setShowSummary(false);
}
preference.setIcon(null);
preferenceScreen.addPreference(preference);
}