Merge remote-tracking branch 'origin/FavouritesBottomSheetMenu' into FavouritesBottomSheetMenu

# Conflicts:
#	OsmAnd/src/net/osmand/plus/mapcontextmenu/other/FavouritesBottomSheetMenuFragment.java
This commit is contained in:
Chumva 2018-03-15 13:37:30 +02:00
commit df71f8d021

View file

@ -48,6 +48,8 @@ public class FavouritesBottomSheetMenuFragment extends MenuBottomSheetDialogFrag
private boolean isSorted = false;
private boolean locationUpdateStarted;
private boolean compassUpdateAllowed = true;
private boolean target;
private boolean intermediate;
private BaseBottomSheetItem title;
private MapRouteInfoMenu routeMenu;