Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
b40ebe9af3
1 changed files with 2 additions and 1 deletions
|
@ -16,6 +16,7 @@ import android.webkit.WebViewClient;
|
||||||
|
|
||||||
import net.osmand.plus.OsmandApplication;
|
import net.osmand.plus.OsmandApplication;
|
||||||
import net.osmand.plus.R;
|
import net.osmand.plus.R;
|
||||||
|
import net.osmand.plus.Version;
|
||||||
import net.osmand.plus.helpers.AndroidUiHelper;
|
import net.osmand.plus.helpers.AndroidUiHelper;
|
||||||
|
|
||||||
import java.io.BufferedReader;
|
import java.io.BufferedReader;
|
||||||
|
@ -45,7 +46,7 @@ public class HelpActivity extends OsmandActionBarActivity {
|
||||||
}
|
}
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
|
|
||||||
String title = getString(R.string.shared_string_help);
|
String title = getString(R.string.shared_string_help) + " (" + Version.getFullVersion(getMyApplication()) + ")";
|
||||||
String url = "index.html";
|
String url = "index.html";
|
||||||
if(getIntent() != null) {
|
if(getIntent() != null) {
|
||||||
String tl = getIntent().getStringExtra(TITLE);
|
String tl = getIntent().getStringExtra(TITLE);
|
||||||
|
|
Loading…
Reference in a new issue