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 2016-01-10 19:20:57 +01:00
commit 6e02401233
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/helpers/WaypointHelper.java
View file

@ -682,8 +682,8 @@ public class WaypointHelper {
} else if (type == TARGETS) { } else if (type == TARGETS) {
IconsCache iconsCache = app.getIconsCache(); IconsCache iconsCache = app.getIconsCache();
if (((TargetPoint) point).start) { if (((TargetPoint) point).start) {
ApplicationMode appMode = app.getSettings().getApplicationMode();
if (app.getTargetPointsHelper().getPointToStart() == null) { if (app.getTargetPointsHelper().getPointToStart() == null) {
ApplicationMode appMode = app.getSettings().getApplicationMode();
return uiCtx.getResources().getDrawable(appMode.getResourceLocationDay()); return uiCtx.getResources().getDrawable(appMode.getResourceLocationDay());
} else { } else {
return iconsCache.getContentIcon(R.drawable.ic_action_marker_dark, !nightMode); return iconsCache.getContentIcon(R.drawable.ic_action_marker_dark, !nightMode);

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

@ -291,8 +291,8 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
}); });
ImageView fromIcon = (ImageView) parentView.findViewById(R.id.fromIcon); ImageView fromIcon = (ImageView) parentView.findViewById(R.id.fromIcon);
ApplicationMode appMode = mapActivity.getMyApplication().getSettings().getApplicationMode();
if (targets.getPointToStart() == null) { if (targets.getPointToStart() == null) {
ApplicationMode appMode = mapActivity.getMyApplication().getSettings().getApplicationMode();
fromIcon.setImageDrawable(mapActivity.getResources().getDrawable(appMode.getResourceLocationDay())); fromIcon.setImageDrawable(mapActivity.getResources().getDrawable(appMode.getResourceLocationDay()));
} else { } else {
fromIcon.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_marker_dark, isLight())); fromIcon.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_marker_dark, isLight()));