Merge branch 'r2.2' of github.com:osmandapp/Osmand into r2.2

This commit is contained in:
Victor Shcherb 2015-11-24 09:26:22 +01:00
commit a3d3d6764e
15 changed files with 26 additions and 17 deletions

View file

@ -30,6 +30,14 @@
android:background="@android:color/transparent"
android:src="@drawable/ic_action_delete_dark"/>
<ImageButton
android:id="@+id/ok_button"
android:layout_width="?attr/actionBarSize"
android:layout_height="match_parent"
android:layout_gravity="right"
android:background="@android:color/transparent"
android:src="@drawable/ic_action_done"/>
<Button
android:id="@+id/save_button"
android:layout_width="wrap_content"

View file

@ -1263,7 +1263,7 @@
<string name="poi_pump_manual">Bomba manual</string>
<string name="poi_pump_powered">Bomba motoritzada</string>
<string name="poi_pump_no">Sense bomba</string>
<string name="poi_pump">Bomba</string>
<string name="poi_pump_yes">Bomba</string>
<string name="poi_water_characteristic_mineral">Característica de l\'aigua: mineral</string>
<string name="poi_water_characteristic_mud">Característica de l\'aigua: argilosa</string>

View file

@ -1368,7 +1368,7 @@
<string name="poi_rtsa_scale">RTSA skala</string>
<string name="poi_pump">Pumpe</string>
<string name="poi_pump_yes">Pumpe</string>
<string name="poi_piste_difficulty_easy">Pistesværhedsgrad: let</string>
<string name="poi_piste_difficulty_intermediate">Pistesværhedsgrad: medium</string>

View file

@ -1347,7 +1347,7 @@
<string name="poi_windfall">Fruto caído</string>
<string name="poi_rtsa_scale">Escala RTSA</string>
<string name="poi_pump">Bomba</string>
<string name="poi_pump_yes">Bomba</string>
<string name="poi_piste_difficulty_easy">Dificultad de la pista: Fácil</string>
<string name="poi_piste_difficulty_intermediate">Dificultad de la pista: Intermedia</string>

View file

@ -1351,7 +1351,7 @@
<string name="poi_windfall">Fruto caído</string>
<string name="poi_rtsa_scale">Escala RTSA</string>
<string name="poi_pump">Bomba</string>
<string name="poi_pump_yes">Bomba</string>
<string name="poi_piste_difficulty_easy">Dificultad de la pista: Fácil</string>
<string name="poi_piste_difficulty_intermediate">Dificultad de la pista: Intermedia</string>

View file

@ -1147,7 +1147,7 @@
<string name="poi_pump_manual">Pompe manuelle</string>
<string name="poi_pump_no">Sans pompe</string>
<string name="poi_pump">Pompe</string>
<string name="poi_pump_yes">Pompe</string>
<string name="poi_pump_powered">Pompe automatique</string>
<string name="poi_water_point">Point d\'eau</string>

View file

@ -1142,7 +1142,7 @@
<string name="poi_pump_manual">Kézipumpa</string>
<string name="poi_pump_powered">Szivattyú</string>
<string name="poi_pump_no">Pumpa nélkül</string>
<string name="poi_pump">Pumpa</string>
<string name="poi_pump_yes">Pumpa</string>
<string name="poi_water_characteristic_mineral">Víz jelleg: ásványvíz</string>
<string name="poi_water_characteristic_mud">Víz jelleg: iszapos</string>

View file

@ -1351,7 +1351,7 @@
<string name="poi_wheelchair_no">Cadeira de rodas: não permitido</string>
<string name="poi_wheelchair_limited">Cadeira de rodas: limitado</string>
<string name="poi_pump">Bomba</string>
<string name="poi_pump_yes">Bomba</string>
<string name="poi_debris">Escombros</string>
<string name="poi_jersey_barrier">Barreira de Nova Jersey</string>

View file

@ -1044,7 +1044,7 @@
<string name="poi_pump_manual">Ручной насос</string>
<string name="poi_pump_powered">Автоматический насос</string>
<string name="poi_pump_no">Без насоса</string>
<string name="poi_pump">Насос</string>
<string name="poi_pump_yes">Насос</string>
<string name="poi_water_characteristic_mineral">Характеристика воды: минеральная</string>
<string name="poi_water_characteristic_mud">Характеристика воды: грязь</string>

View file

@ -1296,7 +1296,7 @@
<string name="poi_pump_manual">Pompa manuale</string>
<string name="poi_pump_powered">Pompa automàtica</string>
<string name="poi_pump_no">Chene pompa</string>
<string name="poi_pump">Pompa</string>
<string name="poi_pump_yes">Pompa</string>
<string name="poi_building">Edifìtziu</string>
<string name="poi_information_guidepost">Indicadore istradale</string>

View file

@ -1319,7 +1319,7 @@
<string name="poi_wheelchair_no">Invalidný vozík: nepovolený</string>
<string name="poi_wheelchair_limited">Invalidný vozík: obmedzene</string>
<string name="poi_pump">Čerpadlo</string>
<string name="poi_pump_yes">Čerpadlo</string>
<string name="poi_garden_type_residential">Typ záhrady: v obytnej oblasti</string>
<string name="poi_garden_type_community">Typ záhrady: spoločenstvo</string>

View file

@ -1347,7 +1347,7 @@
<string name="poi_rtsa_scale">RTSA 的難度</string>
<string name="poi_pump">泵浦</string>
<string name="poi_pump_yes">泵浦</string>
<string name="poi_piste_difficulty_easy">滑雪道難度:容易</string>
<string name="poi_piste_difficulty_intermediate">滑雪道難度:中等</string>

View file

@ -174,7 +174,8 @@
<color name="dialog_inactive_text_color_dark">#78909c</color>
<!-- DownloadedRegionsLayer -->
<color name="region_uptodate">#6632C832</color>
<color name="region_updateable">#66FF8F00</color>
<color name="region_selected">#66FFFF00</color>
<color name="region_uptodate">#5532C832</color>
<color name="region_updateable">#55FF8F00</color>
<color name="region_selected">#55FFFF00</color>
<color name="region_downloading">#44FF61FF</color>
</resources>

View file

@ -1253,7 +1253,7 @@
<string name="poi_pump_manual">Manual pump</string>
<string name="poi_pump_powered">Powered pump</string>
<string name="poi_pump_no">No pump</string>
<string name="poi_pump">Pump</string>
<string name="poi_pump_yes">Pump</string>
<string name="poi_water_characteristic_mineral">Water characteristic: mineral</string>
<string name="poi_water_characteristic_mud">Water characteristic: mud</string>

View file

@ -105,8 +105,8 @@ public class DownloadedRegionsLayer extends OsmandMapLayer implements IContextMe
osmandRegions = rm.getOsmandRegions();
paintDownloaded = getPaint(view.getResources().getColor(R.color.region_uptodate));
paintSelected = getPaint(view.getResources().getColor(R.color.region_selected);
paintDownloading = getPaint(Color.argb(40, 50, 200, 50));
paintSelected = getPaint(view.getResources().getColor(R.color.region_selected));
paintDownloading = getPaint(view.getResources().getColor(R.color.region_downloading));
paintOutdated = getPaint(view.getResources().getColor(R.color.region_updateable));
textPaint = new TextPaint();