From 15f71076f44adc554aaddb15f90889ac4aa99892 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Fri, 16 Sep 2016 19:25:20 +0300
Subject: [PATCH] Merge

---
 .../firstusage/FirstUsageWelcomeFragment.java | 15 ++++++++++++-
 .../osmand/plus/views/ContextMenuLayer.java   | 22 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWelcomeFragment.java b/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWelcomeFragment.java
index 19bbc513c6..b722721351 100644
--- a/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWelcomeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWelcomeFragment.java
@@ -33,11 +33,12 @@ public class FirstUsageWelcomeFragment extends Fragment {
 		skipButton.setOnClickListener(new View.OnClickListener() {
 			@Override
 			public void onClick(View v) {
-
+				/*
 				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
 					Window w = getActivity().getWindow();
 					w.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
 				}
+				*/
 				FirstUsageWizardFragment.startWizard(getActivity());
 			}
 		});
@@ -49,10 +50,22 @@ public class FirstUsageWelcomeFragment extends Fragment {
 	@Override
 	public void onResume() {
 		super.onResume();
+		/*
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
 			Window w = getActivity().getWindow(); // in Activity's onCreate() for instance
 			w.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
 					WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
 		}
+<<<<<<< HEAD
+=======
+		*/
+		((MapActivity)getActivity()).disableDrawer();
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+		((MapActivity)getActivity()).enableDrawer();
+>>>>>>> 45cd256... Removed transparent status bar from first screen
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
index 9c8755873d..ab9c546b21 100644
--- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
@@ -479,6 +479,28 @@ public class ContextMenuLayer extends OsmandMapLayer {
 			boolean res = showContextMenu(point, tileBox, false);
 			if (res) {
 				return true;
+<<<<<<< HEAD
+=======
+			} else {
+				NativeOsmandLibrary nativeLib = NativeOsmandLibrary.getLoadedLibrary();
+				if (nativeLib != null) {
+					//RenderingContext rc = new RenderingContext(activity.getMyApplication());
+					MapRenderRepositories maps = activity.getMyApplication().getResourceManager().getRenderer();
+					RenderedObject[] renderedObjects = nativeLib.searchRenderedObjectsFromContext(maps.getVisibleRenderingContext(), (int)point.x, (int)point.y);
+					if (renderedObjects != null) {
+						Log.e("111", "found " + renderedObjects.length + " object(s) at x=" + point.x + " y=" + point.y);
+						for (RenderedObject renderedObject : renderedObjects) {
+							Log.e("111", "++++ object=" + renderedObject.getName());
+							for (Entry<String, String> entry : renderedObject.getTags().entrySet()) {
+								Log.e("111", "tag=" + entry.getKey() + " value=" + entry.getValue());
+							}
+							Log.e("111", "------------------");
+						}
+					} else {
+						Log.e("111", "objects not found at x=" + point.x + " y=" + point.y);
+					}
+				}
+>>>>>>> 45cd256... Removed transparent status bar from first screen
 			}
 		}