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 2015-03-17 18:16:41 +01:00
commit 30ab1f1dfe
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -938,7 +938,7 @@ public class MapActivityActions implements DialogProvider {
//////////// Others //////////// Others
final OsmAndLocationProvider loc = app.getLocationProvider(); final OsmAndLocationProvider loc = app.getLocationProvider();
// this is development functionality so it should stay preferrably here // this is development functionality so it should stay preferrably here
if (OsmandPlugin.getEnabledPlugin(OsmandDevelopmentPlugin.class) != null) { if (OsmandPlugin.getEnabledPlugin(OsmandDevelopmentPlugin.class) != null && USE_OLD_DRAWER_TODELETE) {
optionsMenuHelper optionsMenuHelper
.item(loc.getLocationSimulation().isRouteAnimating() ? R.string.animate_route_off : R.string.animate_route) .item(loc.getLocationSimulation().isRouteAnimating() ? R.string.animate_route_off : R.string.animate_route)
.icons(R.drawable.ic_action_play_dark, R.drawable.ic_action_play_light) .icons(R.drawable.ic_action_play_dark, R.drawable.ic_action_play_light)

4
OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
View file

@ -247,7 +247,7 @@ public class DashboardOnMap {
} }
switchButton.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getIcon(R.drawable.ic_navigation_drawer, switchButton.setImageDrawable(mapActivity.getMyApplication().getIconsCache().getIcon(R.drawable.ic_navigation_drawer,
R.color.icon_color_light)); R.color.icon_color_light));
mapActivity.findViewById(R.id.MapHudButtonsOverlay).setVisibility(View.INVISIBLE);
} else { } else {
scrollView.setVisibility(View.GONE); scrollView.setVisibility(View.GONE);
switchButton = (ImageView) listViewLayout.findViewById(R.id.map_menu_button); switchButton = (ImageView) listViewLayout.findViewById(R.id.map_menu_button);
@ -269,7 +269,7 @@ public class DashboardOnMap {
open(dashboardView.findViewById(R.id.animateContent)); open(dashboardView.findViewById(R.id.animateContent));
mapActivity.getMapActions().disableDrawer(); mapActivity.getMapActions().disableDrawer();
mapActivity.findViewById(R.id.MapHudButtonsOverlay).setVisibility(View.INVISIBLE);
updateLocation(true, true, false); updateLocation(true, true, false);
} else { } else {