From bf0df9b29de0d9a011fb8501656db1de552d9d0e Mon Sep 17 00:00:00 2001
From: Alexander Sytnyk <asytnyk0@gmail.com>
Date: Mon, 15 Jan 2018 14:00:46 +0200
Subject: [PATCH] Cancel menus on touch outside; fix drawing of menus under the
 navbar

---
 OsmAnd/res/values/styles.xml                                  | 4 ++--
 .../src/net/osmand/plus/base/BottomSheetDialogFragment.java   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index 324296db60..90f9b87da8 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -256,7 +256,7 @@
     </style>
 
     <style name="OsmandLightTheme.BottomSheet">
-        <item name="android:windowIsFloating">true</item>
+        <item name="android:statusBarColor">@color/color_transparent</item>
         <item name="android:dialogTheme">@style/BottomSheet.Dialog</item>
         <item name="android:windowBackground">@color/color_transparent</item>
         <item name="android:backgroundDimAmount">0.3</item>
@@ -264,7 +264,7 @@
     </style>
 
     <style name="OsmandDarkTheme.BottomSheet">
-        <item name="android:windowIsFloating">true</item>
+        <item name="android:statusBarColor">@color/color_transparent</item>
         <item name="android:dialogTheme">@style/BottomSheet.Dialog</item>
         <item name="android:windowBackground">@color/color_transparent</item>
         <item name="android:backgroundDimAmount">0.3</item>
diff --git a/OsmAnd/src/net/osmand/plus/base/BottomSheetDialogFragment.java b/OsmAnd/src/net/osmand/plus/base/BottomSheetDialogFragment.java
index 152c458cda..666e068d23 100644
--- a/OsmAnd/src/net/osmand/plus/base/BottomSheetDialogFragment.java
+++ b/OsmAnd/src/net/osmand/plus/base/BottomSheetDialogFragment.java
@@ -26,6 +26,7 @@ public abstract class BottomSheetDialogFragment extends DialogFragment {
 		int themeId = settings.isLightContent() ? R.style.OsmandLightTheme_BottomSheet : R.style.OsmandDarkTheme_BottomSheet;
 
 		BottomSheetDialog dialog = new BottomSheetDialog(getContext(), themeId);
+		dialog.setCanceledOnTouchOutside(true);
 		Window window = dialog.getWindow();
 		if (!getMyApplication().getSettings().DO_NOT_USE_ANIMATIONS.get() && window != null) {
 			window.getAttributes().windowAnimations = R.style.Animations_PopUpMenu_Bottom;