Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix merge issues...

Browse source
This commit is contained in:
Pavol Zibrita 2011-12-14 02:21:45 +01:00
parent dcb8af2d3b
commit 7255664535
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java
View file

@ -74,11 +74,7 @@ public class FavoritesLayer extends OsmandMapLayer implements ContextMenuLayer.I
int x = view.getRotatedMapXForPoint(o.getLatitude(), o.getLongitude());
int y = view.getRotatedMapYForPoint(o.getLatitude(), o.getLongitude());
canvas.drawBitmap(favoriteIcon, x - favoriteIcon.getWidth() / 2,
<<<<<<< HEAD
y - favoriteIcon.getHeight() , paint);
=======
y - favoriteIcon.getHeight() / 2, paint);
>>>>>>> Update favorite icon
}
}
}