From 2794e4566f55a2b7bfc3a2084b0959d1a0c43485 Mon Sep 17 00:00:00 2001
From: Alexey Kulish <alexey.kulish@osmand.net>
Date: Fri, 16 Sep 2016 19:35:32 +0300
Subject: [PATCH] Fix

---
 .../firstusage/FirstUsageWelcomeFragment.java | 19 +---------------
 .../firstusage/FirstUsageWizardFragment.java  | 12 ++++++++++
 .../osmand/plus/views/ContextMenuLayer.java   | 22 -------------------
 3 files changed, 13 insertions(+), 40 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWelcomeFragment.java b/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWelcomeFragment.java
index b722721351..b030063777 100644
--- a/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWelcomeFragment.java
+++ b/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWelcomeFragment.java
@@ -14,6 +14,7 @@ import android.view.WindowManager;
 import android.widget.ImageView;
 
 import net.osmand.plus.R;
+import net.osmand.plus.activities.MapActivity;
 
 public class FirstUsageWelcomeFragment extends Fragment {
 	public static final String TAG = "FirstUsageWelcomeFragment";
@@ -33,32 +34,15 @@ 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());
 			}
 		});
 		return view;
 	}
 
-
-	@TargetApi(Build.VERSION_CODES.HONEYCOMB)
 	@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();
 	}
 
@@ -66,6 +50,5 @@ public class FirstUsageWelcomeFragment extends Fragment {
 	public void onPause() {
 		super.onPause();
 		((MapActivity)getActivity()).enableDrawer();
->>>>>>> 45cd256... Removed transparent status bar from first screen
 	}
 }
diff --git a/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWizardFragment.java b/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWizardFragment.java
index 7de3fecbf9..73b6e162e6 100644
--- a/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWizardFragment.java
+++ b/OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWizardFragment.java
@@ -434,6 +434,18 @@ public class FirstUsageWizardFragment extends Fragment implements OsmAndLocation
 		app.getAppInitializer().removeListener(this);
 	}
 
+	@Override
+	public void onResume() {
+		super.onResume();
+		((MapActivity)getActivity()).disableDrawer();
+	}
+
+	@Override
+	public void onPause() {
+		super.onPause();
+		((MapActivity)getActivity()).enableDrawer();
+	}
+
 	@Override
 	public void updateLocation(final Location loc) {
 		final OsmandApplication app = getMyApplication();
diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
index ab9c546b21..9c8755873d 100644
--- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
@@ -479,28 +479,6 @@ 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
 			}
 		}