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

Fix #7748

Browse source
This commit is contained in:
Dima-1 2019-10-29 13:08:27 +03:00
parent 03144c7a2b
commit 05af6974fe
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -114,6 +114,7 @@ import net.osmand.plus.measurementtool.MeasurementEditingContext;
import net.osmand.plus.measurementtool.MeasurementToolFragment; import net.osmand.plus.measurementtool.MeasurementToolFragment;
import net.osmand.plus.measurementtool.NewGpxData; import net.osmand.plus.measurementtool.NewGpxData;
import net.osmand.plus.profiles.EditProfileFragment; import net.osmand.plus.profiles.EditProfileFragment;
import net.osmand.plus.quickaction.QuickActionListFragment;
import net.osmand.plus.render.RendererRegistry; import net.osmand.plus.render.RendererRegistry;
import net.osmand.plus.resources.ResourceManager; import net.osmand.plus.resources.ResourceManager;
import net.osmand.plus.routepreparationmenu.ChooseRouteFragment; import net.osmand.plus.routepreparationmenu.ChooseRouteFragment;
@ -682,8 +683,13 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
prevActivityIntent = null; prevActivityIntent = null;
return; return;
} }
if (getMapView().getLayerByClass(MapQuickActionLayer.class).onBackPressed()) if (getMapView().getLayerByClass(MapQuickActionLayer.class).onBackPressed()) {
return; return;
}
QuickActionListFragment quickActionListFragment = getQuickActionListFragment();
if ( quickActionListFragment!=null && quickActionListFragment.isVisible()) {
this.getDashboard().setDashboardVisibility(true, DashboardType.CONFIGURE_SCREEN, null);
}
super.onBackPressed(); super.onBackPressed();
} }
@ -2281,6 +2287,11 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
return fragment != null && !fragment.isDetached() && !fragment.isRemoving() ? (EditProfileFragment) fragment : null; return fragment != null && !fragment.isDetached() && !fragment.isRemoving() ? (EditProfileFragment) fragment : null;
} }
public QuickActionListFragment getQuickActionListFragment() {
Fragment fragment = getSupportFragmentManager().findFragmentByTag(QuickActionListFragment.TAG);
return fragment != null && !fragment.isDetached() && !fragment.isRemoving() ? (QuickActionListFragment) fragment : null;
}
public boolean isTopToolbarActive() { public boolean isTopToolbarActive() {
MapInfoLayer mapInfoLayer = getMapLayers().getMapInfoLayer(); MapInfoLayer mapInfoLayer = getMapLayers().getMapInfoLayer();
return mapInfoLayer.hasTopToolbar(); return mapInfoLayer.hasTopToolbar();