code US non-US switch for alarm list icons
sonora
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 2 KiB |
BIN
OsmAnd/res/drawable-hdpi/list_warnings_traffic_calming_us.png
Normal file
|
After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 2 KiB |
BIN
OsmAnd/res/drawable-large/list_warnings_traffic_calming_us.png
Normal file
|
After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 4.6 KiB After Width: | Height: | Size: 4.4 KiB |
BIN
OsmAnd/res/drawable-large/warnings_traffic_calming_us.png
Normal file
|
After Width: | Height: | Size: 3.7 KiB |
|
|
@ -682,15 +682,27 @@ public class WaypointHelper {
|
|||
} else if(((AlarmInfo) point).getType().toString()="BORDER_CONTROL") {
|
||||
return uiCtx.getResources().getDrawable(R.drawable.mx_barrier_border_control);
|
||||
} else if(((AlarmInfo) point).getType().toString()="RAILWAY") {
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_warnings_railways);
|
||||
if(app.getSettings.DRIVING_REGION.get().americanSigns){
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_warnings_railways_us);
|
||||
} else {
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_warnings_railways);
|
||||
}
|
||||
} else if(((AlarmInfo) point).getType().toString()="TRAFFIC_CALMING") {
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_traffic_calming);
|
||||
if(app.getSettings.DRIVING_REGION.get().americanSigns){
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_traffic_calming_us);
|
||||
} else {
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_traffic_calming);
|
||||
}
|
||||
} else if(((AlarmInfo) point).getType().toString()="TOLL_BOOTH") {
|
||||
return uiCtx.getResources().getDrawable(R.drawable.mx_barrier_toll_booth);
|
||||
} else if(((AlarmInfo) point).getType().toString()="STOP") {
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_stop);
|
||||
} else if(((AlarmInfo) point).getType().toString()="PEDESTRIAN") {
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_warnings_pedestrian);
|
||||
if(app.getSettings.DRIVING_REGION.get().americanSigns){
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_warnings_pedestrian_us);
|
||||
} else {
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_warnings_pedestrian);
|
||||
}
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -726,15 +738,27 @@ public class WaypointHelper {
|
|||
} else if(((AlarmInfo) point).getType().toString()="BORDER_CONTROL") {
|
||||
return uiCtx.getResources().getDrawable(R.drawable.mx_barrier_border_control);
|
||||
} else if(((AlarmInfo) point).getType().toString()="RAILWAY") {
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_warnings_railways);
|
||||
if(app.getSettings.DRIVING_REGION.get().americanSigns){
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_warnings_railways_us);
|
||||
} else {
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_warnings_railways);
|
||||
}
|
||||
} else if(((AlarmInfo) point).getType().toString()="TRAFFIC_CALMING") {
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_traffic_calming);
|
||||
if(app.getSettings.DRIVING_REGION.get().americanSigns){
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_traffic_calming_us);
|
||||
} else {
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_traffic_calming);
|
||||
}
|
||||
} else if(((AlarmInfo) point).getType().toString()="TOLL_BOOTH") {
|
||||
return uiCtx.getResources().getDrawable(R.drawable.mx_barrier_toll_booth);
|
||||
} else if(((AlarmInfo) point).getType().toString()="STOP") {
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_stop);
|
||||
} else if(((AlarmInfo) point).getType().toString()="PEDESTRIAN") {
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_warnings_pedestrian);
|
||||
if(app.getSettings.DRIVING_REGION.get().americanSigns){
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_warnings_pedestrian_us);
|
||||
} else {
|
||||
return uiCtx.getResources().getDrawable(R.drawable.list_warnings_pedestrian);
|
||||
}
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
|
|
|
|||