Merge "Using a common class for loading drawables and handling various badging" into oc-dev

am: d2561263a8

Change-Id: I2e8d795a9d94f068c988c57cdc7610421b62da96
This commit is contained in:
Sunny Goyal
2017-04-19 02:53:17 +00:00
committed by android-build-merger
12 changed files with 37 additions and 116 deletions

View File

@@ -40,6 +40,7 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceCategory;
import android.text.format.Formatter;
import android.util.ArraySet;
import android.util.IconDrawableFactory;
import android.view.View;
import android.widget.AdapterView;
@@ -159,7 +160,7 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen
PackageManager pm = getPackageManager();
try {
ApplicationInfo info = pm.getApplicationInfo(mPackages.valueAt(0), 0);
mIcon = info.loadIcon(pm);
mIcon = IconDrawableFactory.newInstance(getActivity()).getBadgedIcon(info);
mLabel = info.loadLabel(pm);
mPackageName = info.packageName;
} catch (PackageManager.NameNotFoundException e) {