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 2014-07-12 14:56:41 +02:00
commit 2448b9a0d9
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -57,7 +57,7 @@ public class MainMenuActivity extends Activity {
public static final int APP_EXIT_CODE = 4; public static final int APP_EXIT_CODE = 4;
public static final String APP_EXIT_KEY = "APP_EXIT_KEY"; public static final String APP_EXIT_KEY = "APP_EXIT_KEY";
protected static final boolean TIPS_AND_TRICKS = false; public static final boolean TIPS_AND_TRICKS = false;
private ProgressDialog startProgressDialog; private ProgressDialog startProgressDialog;

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

@ -906,9 +906,14 @@ public class MapActivityActions implements DialogProvider {
@Override @Override
public void onContextMenuClick(int itemId, int pos, boolean isChecked, DialogInterface dialog) { public void onContextMenuClick(int itemId, int pos, boolean isChecked, DialogInterface dialog) {
TipsAndTricksActivity tactivity = new TipsAndTricksActivity(mapActivity); if (MainMenuActivity.TIPS_AND_TRICKS) {
Dialog dlg = tactivity.getDialogToShowTips(false, true); TipsAndTricksActivity tactivity = new TipsAndTricksActivity(mapActivity);
dlg.show(); Dialog dlg = tactivity.getDialogToShowTips(false, true);
dlg.show();
} else {
final Intent helpIntent = new Intent(mapActivity, HelpActivity.class);
mapActivity.startActivity(helpIntent);
}
} }
}).reg(); }).reg();
final OsmAndLocationProvider loc = app.getLocationProvider(); final OsmAndLocationProvider loc = app.getLocationProvider();