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

Merge "Badge Wi-Fi installer apps"

Browse Source
This commit is contained in:
Robin Lee
2015-02-27 16:13:55 +00:00
committed by Android (Google) Code Review
parent a330b1a093 0d8879ade7
commit 1a95d1de7e
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,12 +15,16 @@
*/ */
package com.android.settings.wifi; package com.android.settings.wifi;
import android.app.AppGlobals;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageManager;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.StateListDrawable; import android.graphics.drawable.StateListDrawable;
import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiConfiguration;
import android.os.RemoteException;
import android.os.UserHandle;
import android.preference.Preference; import android.preference.Preference;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
@@ -71,13 +75,22 @@ public class AccessPointPreference extends Preference {
Drawable drawable = pm.getDefaultActivityIcon(); Drawable drawable = pm.getDefaultActivityIcon();
if (mConfig == null) { if (mConfig == null) {
drawable.setAlpha(0); drawable.setAlpha(0);
} else if (mConfig.creatorName.equals(systemName)) {
drawable = getContext().getApplicationInfo().loadIcon(pm);
} else { } else {
try { int userId = UserHandle.getUserId(mConfig.creatorUid);
drawable = pm.getApplicationIcon(mConfig.creatorName); ApplicationInfo appInfo = null;
} catch (NameNotFoundException nnfe) { if (mConfig.creatorName.equals(systemName)) {
// use default app icon 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));
} }
} }