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

Context menu fixes

Browse source
This commit is contained in:
Alexey Kulish 2015-11-18 20:03:58 +03:00
parent f8616e04d7
commit 3abb5772c8
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
View file

@ -182,7 +182,9 @@ public class GpxUiHelper {
}
for (SelectedGpxFile selectedGpx : selectedGpxFiles) {
list.add(selectedGpx.getGpxFile().path.substring(gpxDirLength + 1));
if (!selectedGpx.getGpxFile().showCurrentTrack) {
list.add(selectedGpx.getGpxFile().path.substring(gpxDirLength + 1));
}
}
final ContextMenuAdapter adapter = createGpxContextMenuAdapter(activity, list, null, false,

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

@ -406,7 +406,7 @@ public class MapContextMenu extends MenuTitleController {
final List<SelectedGpxFile> list
= mapActivity.getMyApplication().getSelectedGpxHelper().getSelectedGPXFiles();
if (list.isEmpty()) {
if (list.isEmpty() || (list.size() == 1 && list.get(0).getGpxFile().showCurrentTrack)) {
GPXFile gpxFile = mapActivity.getMyApplication().getSavingTrackHelper().getCurrentGpx();
getWptPtPointEditor().add(gpxFile, latLon, title);
} else {

2
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapMultiSelectionMenuFragment.java
View file

@ -59,6 +59,7 @@ public class MapMultiSelectionMenuFragment extends Fragment implements AdapterVi
@Override
public void onStart() {
super.onStart();
menu.getMapActivity().getMapLayers().getMapControlsLayer().setControlsClickable(false);
menu.getMapActivity().getContextMenu().setBaseFragmentVisibility(false);
}
@ -69,6 +70,7 @@ public class MapMultiSelectionMenuFragment extends Fragment implements AdapterVi
menu.onStop();
}
menu.getMapActivity().getContextMenu().setBaseFragmentVisibility(true);
menu.getMapActivity().getMapLayers().getMapControlsLayer().setControlsClickable(true);
}
public static void showInstance(final MapActivity mapActivity) {