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-04-04 16:36:14 +02:00
commit 0a96a7d747
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -75,6 +75,10 @@ public class MapMultiSelectionMenuFragment extends Fragment implements AdapterVi
@Override
public void onResume() {
super.onResume();
if (MapRouteInfoMenu.isVisible()) {
dismissMenu();
return;
}
wasDrawerDisabled = menu.getMapActivity().isDrawerDisabled();
if (!wasDrawerDisabled) {
menu.getMapActivity().disableDrawer();
@ -104,6 +108,7 @@ public class MapMultiSelectionMenuFragment extends Fragment implements AdapterVi
if (mapActivity.isActivityDestroyed()) {
return;
}
mapActivity.getContextMenu().hideMenues();
MapMultiSelectionMenu menu = mapActivity.getContextMenu().getMultiSelectionMenu();

4
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/MapRouteInfoMenuFragment.java
View file

@ -173,9 +173,7 @@ public class MapRouteInfoMenuFragment extends Fragment {
slideOutAnim = R.anim.slide_out_left;
}
if (mapActivity.getContextMenu().isVisible()) {
mapActivity.getContextMenu().hide();
}
mapActivity.getContextMenu().hideMenues();
MapRouteInfoMenuFragment fragment = new MapRouteInfoMenuFragment();
mapActivity.getSupportFragmentManager().beginTransaction()