Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge

Browse source
This commit is contained in:
Alexey Kulish 2016-09-16 19:25:20 +03:00
parent 26703154b1
commit 15f71076f4
2 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
OsmAnd/src/net/osmand/plus/firstusage/FirstUsageWelcomeFragment.java
View file

@ -33,11 +33,12 @@ public class FirstUsageWelcomeFragment extends Fragment {
skipButton.setOnClickListener(new View.OnClickListener() { skipButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
/*
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
Window w = getActivity().getWindow(); Window w = getActivity().getWindow();
w.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); w.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
} }
*/
FirstUsageWizardFragment.startWizard(getActivity()); FirstUsageWizardFragment.startWizard(getActivity());
} }
}); });
@ -49,10 +50,22 @@ public class FirstUsageWelcomeFragment extends Fragment {
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
/*
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
Window w = getActivity().getWindow(); // in Activity's onCreate() for instance Window w = getActivity().getWindow(); // in Activity's onCreate() for instance
w.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS, w.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
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
} }
} }

22
OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java
View file

@ -479,6 +479,28 @@ public class ContextMenuLayer extends OsmandMapLayer {
boolean res = showContextMenu(point, tileBox, false); boolean res = showContextMenu(point, tileBox, false);
if (res) { if (res) {
return true; 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
} }
} }