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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2017-01-12 16:28:16 +01:00
commit f35b4d8fba
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditor.java
View file

@ -59,7 +59,7 @@ public class FavoritePointEditor extends PointEditor {
favorite.setDescription(""); favorite.setDescription("");
favorite.setOriginObjectName(originObjectName); favorite.setOriginObjectName(originObjectName);
FavoritePointEditorFragment.showAutoFillInstance(mapActivity); FavoritePointEditorFragment.showAutoFillInstance(mapActivity, autoFill);
} }
public void edit(FavouritePoint favorite) { public void edit(FavouritePoint favorite) {

4
OsmAnd/src/net/osmand/plus/mapcontextmenu/editors/FavoritePointEditorFragment.java
View file

@ -126,13 +126,13 @@ public class FavoritePointEditorFragment extends PointEditorFragment {
.addToBackStack(null).commit(); .addToBackStack(null).commit();
} }
public static void showAutoFillInstance(final MapActivity mapActivity) { public static void showAutoFillInstance(final MapActivity mapActivity, boolean autoFill) {
FavoritePointEditor editor = mapActivity.getContextMenu().getFavoritePointEditor(); FavoritePointEditor editor = mapActivity.getContextMenu().getFavoritePointEditor();
//int slideInAnim = editor.getSlideInAnimation(); //int slideInAnim = editor.getSlideInAnimation();
//int slideOutAnim = editor.getSlideOutAnimation(); //int slideOutAnim = editor.getSlideOutAnimation();
FavoritePointEditorFragment fragment = new FavoritePointEditorFragment(); FavoritePointEditorFragment fragment = new FavoritePointEditorFragment();
fragment.autoFill = true; fragment.autoFill = autoFill;
mapActivity.getSupportFragmentManager().beginTransaction() mapActivity.getSupportFragmentManager().beginTransaction()
//.setCustomAnimations(slideInAnim, slideOutAnim, slideInAnim, slideOutAnim) //.setCustomAnimations(slideInAnim, slideOutAnim, slideInAnim, slideOutAnim)