Merge "Remove automatic rule icons" into oc-dr1-dev

This commit is contained in:
TreeHugger Robot
2017-07-14 16:45:49 +00:00
committed by Android (Google) Code Review

View File

@@ -306,11 +306,8 @@ public class ZenModeSettings extends ZenModeSettingsBase {
try { try {
ApplicationInfo info = mPm.getApplicationInfo(rule.getOwner().getPackageName(), 0); ApplicationInfo info = mPm.getApplicationInfo(rule.getOwner().getPackageName(), 0);
LoadIconTask task = new LoadIconTask(this);
task.execute(info);
setSummary(computeRuleSummary(rule, isSystemRule, info.loadLabel(mPm))); setSummary(computeRuleSummary(rule, isSystemRule, info.loadLabel(mPm)));
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {
setIcon(R.drawable.ic_label);
appExists = false; appExists = false;
return; return;
} }
@@ -347,29 +344,6 @@ public class ZenModeSettings extends ZenModeSettingsBase {
}; };
} }
private class LoadIconTask extends AsyncTask<ApplicationInfo, Void, Drawable> {
private final WeakReference<Preference> prefReference;
public LoadIconTask(Preference pref) {
prefReference = new WeakReference<>(pref);
}
@Override
protected Drawable doInBackground(ApplicationInfo... params) {
return params[0].loadIcon(mPm);
}
@Override
protected void onPostExecute(Drawable icon) {
if (icon != null) {
final Preference pref = prefReference.get();
if (pref != null) {
pref.setIcon(icon);
}
}
}
}
public static class SummaryBuilder { public static class SummaryBuilder {
private Context mContext; private Context mContext;