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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2015-10-23 13:10:28 +02:00
commit 6e94992b5a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/distancecalculator/DistanceCalculatorPlugin.java
View file

@ -138,7 +138,7 @@ public class DistanceCalculatorPlugin extends OsmandPlugin {
if (mapInfoLayer != null ) { if (mapInfoLayer != null ) {
distanceControl = createDistanceControl(activity); distanceControl = createDistanceControl(activity);
mapInfoLayer.registerSideWidget(distanceControl, mapInfoLayer.registerSideWidget(distanceControl,
R.drawable.ic_action_ruler_dark, R.string.map_widget_distancemeasurement, "distance.measurement", false, 21); R.drawable.ic_action_ruler, R.string.map_widget_distancemeasurement, "distance.measurement", false, 21);
mapInfoLayer.recreateControls(); mapInfoLayer.recreateControls();
updateText(); updateText();
} }

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/ShareMenu.java
View file

@ -28,7 +28,7 @@ public class ShareMenu {
private static final String KEY_SHARE_MENU_POINT_TITLE = "key_share_menu_point_title"; private static final String KEY_SHARE_MENU_POINT_TITLE = "key_share_menu_point_title";
public enum ShareItem { public enum ShareItem {
MESSAGE(R.drawable.ic_action_export, R.string.shared_string_send), MESSAGE(R.drawable.ic_action_message, R.string.shared_string_send),
CLIPBOARD(R.drawable.ic_action_copy, R.string.shared_string_copy), CLIPBOARD(R.drawable.ic_action_copy, R.string.shared_string_copy),
GEO(R.drawable.ic_world_globe_dark, R.string.share_geo), GEO(R.drawable.ic_world_globe_dark, R.string.share_geo),
QR_CODE(R.drawable.ic_action_qrcode, R.string.share_qr_code); QR_CODE(R.drawable.ic_action_qrcode, R.string.share_qr_code);