Remove "Show apps" and add summary to saved networks from Wifi Settings.

Bug: 20148271
Change-Id: Ie042ac83a7253ff86f3eda77fb1e8a4c0e1a13d5
This commit is contained in:
Sanket Padawe
2015-04-13 17:57:38 -07:00
parent 2132cedb94
commit dce1c724f1
4 changed files with 29 additions and 61 deletions

View File

@@ -15,16 +15,9 @@
*/
package com.android.settings.wifi;
import android.app.AppGlobals;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.StateListDrawable;
import android.net.wifi.WifiConfiguration;
import android.os.RemoteException;
import android.os.UserHandle;
import android.preference.Preference;
import android.view.View;
import android.widget.TextView;
@@ -67,36 +60,6 @@ public class AccessPointPreference extends Preference {
notifyChanged();
}
public void showAppIcon() {
PackageManager pm = getContext().getPackageManager();
String systemName = pm.getNameForUid(android.os.Process.SYSTEM_UID);
WifiConfiguration mConfig = mAccessPoint.getConfig();
Drawable drawable = pm.getDefaultActivityIcon();
if (mConfig == null) {
drawable.setAlpha(0);
} else {
int userId = UserHandle.getUserId(mConfig.creatorUid);
ApplicationInfo appInfo = null;
if (mConfig.creatorName.equals(systemName)) {
appInfo = getContext().getApplicationInfo();
} else {
try {
IPackageManager ipm = AppGlobals.getPackageManager();
appInfo = ipm.getApplicationInfo(mConfig.creatorName, 0 /* flags */, userId);
} catch (RemoteException rex) {
// use default app icon
}
}
if (appInfo != null) {
drawable = appInfo.loadIcon(pm);
drawable = pm.getUserBadgedIcon(drawable, new UserHandle(userId));
}
}
setIcon(drawable);
}
protected void updateIcon(int level, Context context) {
if (level == -1) {
setIcon(null);