Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
713eb1dac1
1 changed files with 2 additions and 2 deletions
|
@ -13,7 +13,7 @@ import android.graphics.PorterDuff;
|
||||||
import android.graphics.PorterDuffColorFilter;
|
import android.graphics.PorterDuffColorFilter;
|
||||||
import android.graphics.Rect;
|
import android.graphics.Rect;
|
||||||
import android.graphics.drawable.Drawable;
|
import android.graphics.drawable.Drawable;
|
||||||
|
import android.support.v4.content.res.ResourcesCompat;
|
||||||
import net.osmand.plus.R;
|
import net.osmand.plus.R;
|
||||||
|
|
||||||
import java.util.TreeMap;
|
import java.util.TreeMap;
|
||||||
|
@ -41,7 +41,7 @@ public class FavoriteImageDrawable extends Drawable {
|
||||||
paintIcon = new Paint();
|
paintIcon = new Paint();
|
||||||
favIcon = BitmapFactory.decodeResource(ctx.getResources(), R.drawable.map_favorite);
|
favIcon = BitmapFactory.decodeResource(ctx.getResources(), R.drawable.map_favorite);
|
||||||
favBackground = BitmapFactory.decodeResource(ctx.getResources(), R.drawable.map_white_favorite_shield);
|
favBackground = BitmapFactory.decodeResource(ctx.getResources(), R.drawable.map_white_favorite_shield);
|
||||||
listDrawable = getResources().getDrawable(R.drawable.ic_action_fav_dark).mutate();
|
listDrawable = ResourcesCompat.getDrawable(getResources(), R.drawable.ic_action_fav_dark, null).mutate();
|
||||||
|
|
||||||
paintOuter = new Paint();
|
paintOuter = new Paint();
|
||||||
paintOuter.setAntiAlias(true);
|
paintOuter.setAntiAlias(true);
|
||||||
|
|
Loading…
Reference in a new issue