Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
f35b4d8fba
2 changed files with 3 additions and 3 deletions
|
@ -59,7 +59,7 @@ public class FavoritePointEditor extends PointEditor {
|
|||
favorite.setDescription("");
|
||||
favorite.setOriginObjectName(originObjectName);
|
||||
|
||||
FavoritePointEditorFragment.showAutoFillInstance(mapActivity);
|
||||
FavoritePointEditorFragment.showAutoFillInstance(mapActivity, autoFill);
|
||||
}
|
||||
|
||||
public void edit(FavouritePoint favorite) {
|
||||
|
|
|
@ -126,13 +126,13 @@ public class FavoritePointEditorFragment extends PointEditorFragment {
|
|||
.addToBackStack(null).commit();
|
||||
}
|
||||
|
||||
public static void showAutoFillInstance(final MapActivity mapActivity) {
|
||||
public static void showAutoFillInstance(final MapActivity mapActivity, boolean autoFill) {
|
||||
FavoritePointEditor editor = mapActivity.getContextMenu().getFavoritePointEditor();
|
||||
//int slideInAnim = editor.getSlideInAnimation();
|
||||
//int slideOutAnim = editor.getSlideOutAnimation();
|
||||
|
||||
FavoritePointEditorFragment fragment = new FavoritePointEditorFragment();
|
||||
fragment.autoFill = true;
|
||||
fragment.autoFill = autoFill;
|
||||
|
||||
mapActivity.getSupportFragmentManager().beginTransaction()
|
||||
//.setCustomAnimations(slideInAnim, slideOutAnim, slideInAnim, slideOutAnim)
|
||||
|
|
Loading…
Reference in a new issue