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-05-03 18:25:37 +02:00
commit 996e050354
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/AndroidManifest.xml
View file

@ -85,6 +85,7 @@
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<data android:scheme="google.navigation"/>
<data android:scheme="osmand.navigation"/>
</intent-filter>
<receiver android:name="net.osmand.plus.audionotes.MediaRemoteControlReceiver">
@ -130,6 +131,7 @@
<activity android:name="net.osmand.plus.activities.search.GeoIntentActivity">
<intent-filter>
<data android:scheme="geo" />
<data android:scheme="osmand.geo" />
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>

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

@ -342,7 +342,7 @@ public class MapActivity extends AccessibleActivity {
{
showImportedGpx(data.getPath());
}
else if("google.navigation".equals(scheme))
else if("google.navigation".equals(scheme) || "osmand.navigation".equals(scheme))
{
final String schemeSpecificPart = data.getSchemeSpecificPart();

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

@ -276,7 +276,7 @@ public class GeoIntentActivity extends OsmandListActivity {
return null;
}
}
if ("geo".equals(scheme))
if ("geo".equals(scheme) || "osmand.geo".equals(scheme))
{
//geo:
final String schemeSpecific = data.getSchemeSpecificPart();