Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-03-25 00:47:27 +01:00
commit adeab235c4

View file

@ -26,16 +26,19 @@ public class DirectionDrawable extends Drawable {
this(ctx, width, height);
IconsCache iconsCache = ((OsmandApplication) ctx.getApplicationContext()).getIconsCache();
arrowImage = iconsCache.getIcon(resourceId, clrId);
this.resourceId = resourceId;
}
public void setImage(int resourceId, int clrId) {
IconsCache iconsCache = ((OsmandApplication) ctx.getApplicationContext()).getIconsCache();
arrowImage = iconsCache.getIcon(resourceId, clrId);
arrowImage = iconsCache.getIcon(resourceId, clrId);
this.resourceId = resourceId;
}
public void setImage(int resourceId){
IconsCache iconsCache = ((OsmandApplication) ctx.getApplicationContext()).getIconsCache();
arrowImage = iconsCache.getIcon(resourceId, 0);
this.resourceId = resourceId;
}