Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/osmandapp/Osmand

Browse source
This commit is contained in:
Victor Shcherb 2014-07-14 19:56:08 +02:00
commit f755bfd687
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values-ru/strings.xml
View file

@ -1308,7 +1308,7 @@
<string name="local_indexes_cat_srtm">Данные горизонталей</string>
<string name="downloading_file_new">Загрузка…</string>
<string name="osmand_distance_planning_plugin_description">Создание путей (или модификация существующего файла GPX) для измерения дистанции между точками. Сохранить как GPX (может использоваться для планирования маршрутов GPX).</string>
<string name="context_menu_item_destination_point">Установить как пункт назначения</string>
<string name="context_menu_item_destination_point">Пункт назначения</string>
<string name="please_select_address">Сначала выберите город или улицу</string>
<string name="destination_point">Пункт назначения %1$s</string>
<string name="av_camera_focus">Режим фокусировки камеры</string>

2
OsmAnd/src/net/osmand/plus/helpers/GpxImportHelper.java
View file

@ -178,13 +178,13 @@ public class GpxImportHelper {
favoritesHelper.addFavourite(favourite, false);
}
favoritesHelper.saveCurrentPointsIntoFile();
AccessibleToast.makeText(mapActivity, R.string.fav_imported_sucessfully, Toast.LENGTH_LONG).show();
return null;
}
@Override
protected void onPostExecute(GPXUtilities.GPXFile result) {
progress.dismiss();
AccessibleToast.makeText(mapActivity, R.string.fav_imported_sucessfully, Toast.LENGTH_LONG).show();
final Intent newIntent = new Intent(mapActivity, application.getAppCustomization().getFavoritesActivity());
mapActivity.startActivity(newIntent);
}

2
OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
View file

@ -687,6 +687,8 @@ public class MapInfoLayer extends OsmandMapLayer {
layout.addView(widget, fparams);
fparams = new FrameLayout.LayoutParams((int) (backToLoc.getMinimumWidth() ),
backToLoc.getMinimumHeight());
//this fix needed for android 2.3 because margin doesn't work without gravity
fparams.gravity = Gravity.TOP;
fparams.setMargins((int) (5 * scaleCoefficient), 0, 0, 0);
layout.addView(progressBar, fparams);
layout.setOnClickListener(new View.OnClickListener() {