Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2018-01-26 10:30:45 +01:00
commit cdd6425c30

View file

@ -445,16 +445,9 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
fromDropDownIcon.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getIcon(R.drawable.ic_action_arrow_drop_down, isLight())); fromDropDownIcon.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getIcon(R.drawable.ic_action_arrow_drop_down, isLight()));
} }
@SuppressWarnings("deprecation")
public void updateFromIcon(View parentView) { public void updateFromIcon(View parentView) {
TargetPointsHelper targets = getTargets(); ((ImageView) parentView.findViewById(R.id.fromIcon)).setImageDrawable(ContextCompat.getDrawable(mapActivity,
ImageView fromIcon = (ImageView) parentView.findViewById(R.id.fromIcon); getTargets().getPointToStart() == null ? R.drawable.ic_action_location_color : R.drawable.list_startpoint));
if (targets.getPointToStart() == null) {
ApplicationMode appMode = mapActivity.getMyApplication().getSettings().getApplicationMode();
fromIcon.setImageDrawable(mapActivity.getResources().getDrawable(appMode.getResourceLocationDay()));
} else {
fromIcon.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getIcon(R.drawable.list_startpoint, 0));
}
} }
protected void selectOnScreen(boolean target) { protected void selectOnScreen(boolean target) {