mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Load adaptive icons

This commit is contained in:
M66B 2017-08-03 10:59:32 +02:00
parent 2e836b1266
commit c5f7b68dd8
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/eu/faircode/netguard/AdapterRule.java
View File

@ -19,7 +19,6 @@ package eu.faircode.netguard;
Copyright 2015-2017 by Marcel Bokhorst (M66B) Copyright 2015-2017 by Marcel Bokhorst (M66B)
*/ */
import android.Manifest;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.Activity; import android.app.Activity;
import android.content.Context; import android.content.Context;
@ -31,9 +30,11 @@ import android.database.Cursor;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.graphics.drawable.Icon;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Build; import android.os.Build;
import android.os.Handler;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.v4.app.NotificationManagerCompat; import android.support.v4.app.NotificationManagerCompat;
import android.support.v4.content.ContextCompat; import android.support.v4.content.ContextCompat;
@ -329,11 +330,25 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> im
holder.ivExpander.setImageLevel(rule.expanded ? 1 : 0); holder.ivExpander.setImageLevel(rule.expanded ? 1 : 0);
// Show application icon // Show application icon
if (rule.info.applicationInfo == null || rule.info.applicationInfo.icon == 0) if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
Picasso.with(context).load(android.R.drawable.sym_def_app_icon).into(holder.ivIcon); Icon icon;
else { if (rule.info.applicationInfo == null || rule.info.applicationInfo.icon == 0)
Uri uri = Uri.parse("android.resource://" + rule.info.packageName + "/" + rule.info.applicationInfo.icon); icon = Icon.createWithResource(context, android.R.drawable.sym_def_app_icon);
Picasso.with(context).load(uri).resize(iconSize, iconSize).into(holder.ivIcon); else
icon = Icon.createWithResource(rule.info.packageName, rule.info.applicationInfo.icon);
icon.loadDrawableAsync(context, new Icon.OnDrawableLoadedListener() {
@Override
public void onDrawableLoaded(Drawable drawable) {
holder.ivIcon.setImageDrawable(drawable);
}
}, new Handler(context.getMainLooper()));
} else {
if (rule.info.applicationInfo == null || rule.info.applicationInfo.icon == 0)
Picasso.with(context).load(android.R.drawable.sym_def_app_icon).into(holder.ivIcon);
else {
Uri uri = Uri.parse("android.resource://" + rule.info.packageName + "/" + rule.info.applicationInfo.icon);
Picasso.with(context).load(uri).resize(iconSize, iconSize).into(holder.ivIcon);
}
} }
// Show application label // Show application label