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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-02-06 11:38:51 +01:00
commit cace34ce32
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -113,6 +113,7 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents,
private static MapViewTrackingUtilities mapViewTrackingUtilities;
private static MapContextMenu mapContextMenu = new MapContextMenu();
private static Intent prevActivityIntent = null;
private BroadcastReceiver screenOffReceiver;
@ -408,8 +409,6 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents,
setIntent(intent);
}
private static Intent prevActivityIntent = null;
@Override
public void onBackPressed() {
if (dashboardOnMap.onBackPressed()) {