Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-01-04 12:26:30 +01:00
commit 305b37f53d

View file

@ -291,7 +291,11 @@ 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(); ApplicationMode appMode = mapActivity.getMyApplication().getSettings().getApplicationMode();
fromIcon.setImageDrawable(mapActivity.getResources().getDrawable(appMode.getResourceLocationDay())); if (targets.getPointToStart() = null) {
fromIcon.setImageDrawable(mapActivity.getResources().getDrawable(appMode.getResourceLocationDay()));
} else {
fromIcon.setImageDrawable(getIconOrig(R.drawable.ic_action_marker_dark);
}
ImageView fromDropDownIcon = (ImageView) parentView.findViewById(R.id.fromDropDownIcon); ImageView fromDropDownIcon = (ImageView) parentView.findViewById(R.id.fromDropDownIcon);
fromDropDownIcon.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_arrow_drop_down, isLight())); fromDropDownIcon.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_action_arrow_drop_down, isLight()));