Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-12-09 23:38:43 +01:00
commit 7b3a7e98e8
2 changed files with 255 additions and 442 deletions

View file

@ -89,7 +89,7 @@ public class RoutePlannerFrontEnd {
@Override @Override
public int compare(RouteSegmentPoint o1, RouteSegmentPoint o2) { public int compare(RouteSegmentPoint o1, RouteSegmentPoint o2) {
return Double.compare(o1.dist, o2.dist); return Double.compare(o1.distSquare, o2.distSquare);
} }
}); });
if(list.size() > 0) { if(list.size() > 0) {

View file

@ -1,433 +1,252 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest package="net.osmand.plus" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:installLocation="auto" android:installLocation="auto"
android:versionName="@string/app_version"
android:versionCode="231" android:versionCode="231"
android:versionName="@string/app_version"> package="net.osmand.plus">
<uses-sdk <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
android:minSdkVersion="14"
android:targetSdkVersion="21"/>
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.STORAGE"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-permission android:name="android.permission.CAMERA"/>
<uses-permission android:name="android.permission.VIBRATE"/>
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
<uses-permission android:name="com.android.vending.BILLING"/>
<uses-feature <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
android:name="android.hardware.camera" <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
android:required="false"/> <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
<uses-feature
android:name="android.hardware.camera.autofocus"
android:required="false"/>
<uses-feature
android:name="android.hardware.microphone"
android:required="false"/>
<uses-feature
android:name="android.hardware.wifi"
android:required="false"/>
<uses-feature
android:name="android.hardware.location"
android:required="false"/>
<uses-feature
android:name="android.hardware.location.network"
android:required="false"/>
<uses-feature
android:name="android.hardware.location.gps"
android:required="false"/>
<uses-feature
android:name="android.hardware.sensor.light"
android:required="false"/>
<uses-feature
android:name="android.hardware.sensor.compass"
android:required="false"/>
<uses-feature
android:name="android.hardware.sensor.accelerometer"
android:required="false"/>
<uses-feature
android:name="android.hardware.sensor.gyroscope"
android:required="false"/>
<uses-feature
android:name="android.hardware.touchscreen"
android:required="false"/>
<supports-screens <uses-permission android:name="android.permission.INTERNET" />
android:anyDensity="true" <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
android:largeScreens="true" <uses-permission android:name="android.permission.STORAGE" />
android:normalScreens="true" <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
android:resizeable="true" <uses-permission android:name="android.permission.WAKE_LOCK" />
android:smallScreens="true" <uses-permission android:name="android.permission.CAMERA" />
android:xlargeScreens="true"/> <uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="com.android.vending.BILLING" />
<uses-feature android:name="android.hardware.camera" android:required="false" />
<uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
<uses-feature android:name="android.hardware.microphone" android:required="false" />
<uses-feature android:name="android.hardware.wifi" android:required="false" />
<uses-feature android:name="android.hardware.location" android:required="false" />
<uses-feature android:name="android.hardware.location.network" android:required="false" />
<uses-feature android:name="android.hardware.location.gps" android:required="false" />
<uses-feature android:name="android.hardware.sensor.light" android:required="false" />
<uses-feature android:name="android.hardware.sensor.compass" android:required="false" />
<uses-feature android:name="android.hardware.sensor.accelerometer" android:required="false" />
<uses-feature android:name="android.hardware.sensor.gyroscope" android:required="false" />
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
<supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true"
android:xlargeScreens="true" android:anyDensity="true" />
<android:uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<android:uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<!-- android:theme="@style/OsmandLightDarkActionBarTheme" --> <!-- android:theme="@style/OsmandLightDarkActionBarTheme" -->
<application <application android:allowBackup="true" android:backupAgent="net.osmand.plus.OsmandBackupAgent"
android:name=".OsmandApplication" android:icon="@drawable/icon" android:label="@string/app_name"
android:allowBackup="true" android:name="net.osmand.plus.OsmandApplication" android:configChanges="locale"
android:backupAgent=".OsmandBackupAgent" android:theme="@style/OsmandDarkTheme" android:restoreAnyVersion="true" android:largeHeap="true">
android:configChanges="locale"
android:icon="@drawable/icon"
android:label="@string/app_name"
android:largeHeap="true"
android:restoreAnyVersion="true"
android:theme="@style/OsmandDarkTheme">
<meta-data
android:name="com.google.android.backup.api_key"
android:value="AEdPqrEAAAAIqF3tNGT66etVBn_vgzpfAY1wmIzKV1Ss6Ku-2A"/>
<meta-data
android:name="com.sec.android.support.multiwindow"
android:value="true"/>
<meta-data
android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W"
android:resource="@dimen/app_defaultsize_w"
android:value=""/>
<meta-data
android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H"
android:resource="@dimen/app_defaultsize_h"
android:value=""/>
<meta-data
android:name="com.sec.android.multiwindow.MINIMUM_SIZE_W"
android:resource="@dimen/app_minimumsize_w"
android:value=""/>
<meta-data
android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H"
android:resource="@dimen/app_minimumsize_h"
android:value=""/>
<meta-data
android:name="com.sec.minimode.icon.portrait.normal"
android:resource="@drawable/icon"
android:value=""/>
<meta-data
android:name="com.sec.minimode.icon.landscape.normal"
android:resource="@drawable/icon"
android:value=""/>
<activity android:name=".activities.HelpActivity"/> <meta-data android:name="com.google.android.backup.api_key" android:value="AEdPqrEAAAAIqF3tNGT66etVBn_vgzpfAY1wmIzKV1Ss6Ku-2A" />
<activity android:name=".activities.ExitActivity"/> <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" android:resource="@dimen/app_defaultsize_w" android:value="" />
<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:resource="@dimen/app_defaultsize_h" android:value="" />
<meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_W" android:resource="@dimen/app_minimumsize_w" android:value="" />
<meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H" android:resource="@dimen/app_minimumsize_h" android:value="" />
<meta-data android:name="com.sec.minimode.icon.portrait.normal" android:resource="@drawable/icon" android:value="" />
<meta-data android:name="com.sec.minimode.icon.landscape.normal" android:resource="@drawable/icon" android:value="" />
<activity android:name="net.osmand.plus.activities.HelpActivity" />
<activity android:name="net.osmand.plus.activities.ExitActivity" />
<provider <provider
android:name="android.support.v4.content.FileProvider" android:name="android.support.v4.content.FileProvider"
android:authorities="net.osmand.fileprovider" android:authorities="net.osmand.fileprovider"
android:exported="false" android:exported="false"
android:grantUriPermissions="true"> android:grantUriPermissions="true" >
<meta-data <meta-data
android:name="android.support.FILE_PROVIDER_PATHS" android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/paths"/> android:resource="@xml/paths" />
</provider> </provider>
<activity <activity android:name="net.osmand.plus.activities.MapActivity" android:label="@string/app_name"
android:name=".activities.MapActivity" android:screenOrientation="unspecified" android:launchMode="singleTop">
android:label="@string/app_name"
android:launchMode="singleTop"
android:screenOrientation="unspecified">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW" />
<action android:name="android.intent.action.SEND"/> <action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.DEFAULT"/> <data android:scheme="content" android:host="*" android:mimeType="binary/octet-stream" />
<data android:scheme="content" android:host="*" android:mimeType="application/octet-stream" />
<data
android:host="*"
android:mimeType="binary/octet-stream"
android:scheme="content"/>
<data
android:host="*"
android:mimeType="application/octet-stream"
android:scheme="content"/>
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
<category android:name="android.intent.category.MULTIWINDOW_LAUNCHER"/>
</intent-filter>
<intent-filter>
<data android:scheme="http"/>
<data android:host="osmand.net"/>
<data android:pathPrefix="/go"/>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<category android:name="android.intent.category.APP_MAPS"/>
<category android:name="android.intent.category.CAR_MODE"/>
<category android:name="android.intent.category.CAR_DOCK"/>
<category android:name="android.intent.category.DESK_DOCK"/>
</intent-filter>
<intent-filter>
<data android:scheme="https"/>
<data android:host="osmand.net"/>
<data android:pathPrefix="/go"/>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<category android:name="android.intent.category.APP_MAPS"/>
<category android:name="android.intent.category.CAR_MODE"/>
<category android:name="android.intent.category.CAR_DOCK"/>
<category android:name="android.intent.category.DESK_DOCK"/>
</intent-filter> </intent-filter>
<!-- android matches non-greedy : http://stackoverflow.com/questions/3400072/pathpattern-to-match-file-extension-does-not-work-if-a-period-exists-elsewhere-i --> <intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
</intent-filter>
<intent-filter>
<data android:scheme="http" />
<data android:host="osmand.net" />
<data android:pathPrefix="/go" />
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.APP_MAPS" />
<category android:name="android.intent.category.CAR_MODE" />
<category android:name="android.intent.category.CAR_DOCK" />
<category android:name="android.intent.category.DESK_DOCK" />
</intent-filter>
<intent-filter>
<data android:scheme="https" />
<data android:host="osmand.net" />
<data android:pathPrefix="/go" />
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.APP_MAPS" />
<category android:name="android.intent.category.CAR_MODE" />
<category android:name="android.intent.category.CAR_DOCK" />
<category android:name="android.intent.category.DESK_DOCK" />
</intent-filter>
<!-- android matches non-greedy : http://stackoverflow.com/questions/3400072/pathpattern-to-match-file-extension-does-not-work-if-a-period-exists-elsewhere-i-->
<!-- mimeType&host are both needed or you will either have unwanted matching or no match when needed --> <!-- mimeType&host are both needed or you will either have unwanted matching or no match when needed -->
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.DEFAULT"/> <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.gpx" />
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\.gpx" />
<data <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\.gpx" />
android:host="*" <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\.gpx" />
android:mimeType="*/*" <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gpx" />
android:pathPattern=".*\\.gpx" <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.kml" />
android:scheme="file"/> <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\.kml" />
<data <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\.kml" />
android:host="*" <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\.kml" />
android:mimeType="*/*" <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kml" />
android:pathPattern=".*\\..*\\.gpx"
android:scheme="file"/>
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\..*\\..*\\.gpx"
android:scheme="file"/>
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\..*\\..*\\..*\\.gpx"
android:scheme="file"/>
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gpx"
android:scheme="file"/>
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\.kml"
android:scheme="file"/>
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\..*\\.kml"
android:scheme="file"/>
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\..*\\..*\\.kml"
android:scheme="file"/>
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\..*\\..*\\..*\\.kml"
android:scheme="file"/>
<data
android:host="*"
android:mimeType="*/*"
android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kml"
android:scheme="file"/>
</intent-filter> </intent-filter>
<!-- google navigation intent --> <!-- google navigation intent -->
<intent-filter> <intent-filter>
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.DEFAULT"/> <data android:scheme="google.navigation" />
<data android:scheme="osmand.navigation" />
<data android:scheme="google.navigation"/>
<data android:scheme="osmand.navigation"/>
</intent-filter> </intent-filter>
</activity> </activity>
<receiver android:name=".audionotes.MediaRemoteControlReceiver"> <receiver android:name="net.osmand.plus.audionotes.MediaRemoteControlReceiver">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.CAMERA_BUTTON"/> <action android:name="android.intent.action.CAMERA_BUTTON" />
<action android:name="android.intent.action.MEDIA_BUTTON"/> <action android:name="android.intent.action.MEDIA_BUTTON" />
</intent-filter> </intent-filter>
</receiver> </receiver>
<activity <activity android:name="net.osmand.plus.activities.SettingsActivity" android:label="@string/shared_string_settings" android:configChanges="keyboardHidden|orientation" />
android:name=".activities.SettingsActivity" <activity android:name="net.osmand.plus.activities.SettingsGeneralActivity" android:configChanges="keyboardHidden|orientation" />
android:configChanges="keyboardHidden|orientation" <activity android:name="net.osmand.plus.activities.SettingsNavigationActivity" android:configChanges="keyboardHidden|orientation" />
android:label="@string/shared_string_settings"/> <activity android:name="net.osmand.plus.monitoring.SettingsMonitoringActivity" android:configChanges="keyboardHidden|orientation" />
<activity <activity android:name="net.osmand.plus.rastermaps.SettingsRasterMapsActivity" android:configChanges="keyboardHidden|orientation" />
android:name=".activities.SettingsGeneralActivity" <activity android:name="net.osmand.plus.routepointsnavigation.RoutePointsActivity" />
android:configChanges="keyboardHidden|orientation"/>
<activity <activity android:name="net.osmand.plus.osmedit.SettingsOsmEditingActivity" android:configChanges="keyboardHidden|orientation" />
android:name=".activities.SettingsNavigationActivity" <activity android:name="net.osmand.plus.development.SettingsDevelopmentActivity" android:configChanges="keyboardHidden|orientation" />
android:configChanges="keyboardHidden|orientation"/> <activity android:name="net.osmand.plus.audionotes.SettingsAudioVideoActivity" android:configChanges="keyboardHidden|orientation" />
<activity <activity android:name="net.osmand.access.SettingsAccessibilityActivity" android:configChanges="keyboardHidden|orientation" />
android:name=".monitoring.SettingsMonitoringActivity"
android:configChanges="keyboardHidden|orientation"/> <activity android:name="net.osmand.plus.activities.search.SearchActivity" android:label="@string/search_activity" />
<activity <activity android:name="net.osmand.plus.activities.ShowRouteInfoActivity" android:label="@string/show_route" />
android:name=".rastermaps.SettingsRasterMapsActivity" <activity android:name="net.osmand.plus.activities.FavoritesListActivity" android:label="@string/favourites_list_activity" />
android:configChanges="keyboardHidden|orientation"/> <activity android:name=".myplaces.FavoritesActivity" android:windowSoftInputMode="adjustPan" />
<activity android:name=".routepointsnavigation.RoutePointsActivity"/> <activity android:name="net.osmand.plus.activities.TrackActivity"/>
<activity <activity android:name="net.osmand.plus.activities.PluginsActivity" />
android:name=".osmedit.SettingsOsmEditingActivity" <activity android:name="net.osmand.plus.activities.PluginActivity" />
android:configChanges="keyboardHidden|orientation"/> <activity android:name="net.osmand.plus.activities.ContributionVersionActivity" android:configChanges="keyboardHidden|orientation" android:label="@string/contribution_activity" />
<activity
android:name=".development.SettingsDevelopmentActivity"
android:configChanges="keyboardHidden|orientation"/> <activity android:name="net.osmand.plus.osmo.SettingsOsMoActivity" android:configChanges="keyboardHidden|orientation" />
<activity <activity android:name="net.osmand.plus.osmo.OsMoGroupsActivity">
android:name=".audionotes.SettingsAudioVideoActivity"
android:configChanges="keyboardHidden|orientation"/>
<activity
android:name="net.osmand.access.SettingsAccessibilityActivity"
android:configChanges="keyboardHidden|orientation"/>
<activity
android:name=".activities.search.SearchActivity"
android:label="@string/search_activity"/>
<activity
android:name=".activities.ShowRouteInfoActivity"
android:label="@string/show_route"/>
<activity
android:name=".activities.FavoritesListActivity"
android:label="@string/favourites_list_activity"/>
<activity
android:name=".myplaces.FavoritesActivity"
android:windowSoftInputMode="adjustPan"/>
<activity android:name=".activities.TrackActivity"/>
<activity android:name=".activities.PluginsActivity"/>
<activity android:name=".activities.PluginActivity"/>
<activity
android:name=".activities.ContributionVersionActivity"
android:configChanges="keyboardHidden|orientation"
android:label="@string/contribution_activity"/>
<activity
android:name=".osmo.SettingsOsMoActivity"
android:configChanges="keyboardHidden|orientation"/>
<activity android:name=".osmo.OsMoGroupsActivity">
<intent-filter> <intent-filter>
<data <data android:scheme="http" android:host="z.osmo.mobi" />
android:host="z.osmo.mobi" <action android:name="android.intent.action.VIEW" />
android:scheme="http"/> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
</intent-filter> </intent-filter>
</activity> </activity>
<activity
android:name=".activities.search.SearchPOIActivity" <activity android:name="net.osmand.plus.activities.search.SearchPOIActivity" android:label="@string/searchpoi_activity" />
android:label="@string/searchpoi_activity"/> <activity android:name="net.osmand.plus.activities.search.SearchAddressActivity" android:label="@string/select_address_activity" />
<activity <activity android:name="net.osmand.plus.activities.search.SearchCityByNameActivity" />
android:name=".activities.search.SearchAddressActivity" <activity android:name="net.osmand.plus.activities.search.SearchRegionByNameActivity" />
android:label="@string/select_address_activity"/> <activity android:name="net.osmand.plus.activities.search.SearchStreetByNameActivity" />
<activity android:name=".activities.search.SearchCityByNameActivity"/> <activity android:name="net.osmand.plus.activities.search.SearchStreet2ByNameActivity" />
<activity android:name=".activities.search.SearchRegionByNameActivity"/> <activity android:name="net.osmand.plus.activities.search.SearchBuildingByNameActivity" />
<activity android:name=".activities.search.SearchStreetByNameActivity"/> <activity android:name="net.osmand.plus.sherpafy.TourViewActivity" android:exported="true"
<activity android:name=".activities.search.SearchStreet2ByNameActivity"/> android:launchMode= "singleInstance" android:label="Sherpafy" />
<activity android:name=".activities.search.SearchBuildingByNameActivity"/> <activity android:name="net.osmand.plus.activities.EditPOIFilterActivity" />
<activity
android:name=".sherpafy.TourViewActivity" <activity android:name="net.osmand.plus.activities.search.GeoIntentActivity" android:label="@string/app_name">
android:exported="true"
android:label="Sherpafy"
android:launchMode="singleInstance"/>
<activity android:name=".activities.EditPOIFilterActivity"/>
<activity
android:name=".activities.search.GeoIntentActivity"
android:label="@string/app_name">
<intent-filter> <intent-filter>
<data android:scheme="osmand.geo"/> <data android:scheme="osmand.geo" />
<action android:name="android.intent.action.VIEW" />
<action android:name="android.intent.action.VIEW"/> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<data android:scheme="geo"/> <data android:scheme="geo" />
<action android:name="android.intent.action.VIEW"/> <action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/> <category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/> <category android:name="android.intent.category.BROWSABLE"/>
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<data android:scheme="http"/> <data android:scheme="http" />
<data android:scheme="https"/> <data android:scheme="https" />
<data android:host="maps.google.com"/> <data android:host="maps.google.com" />
<data android:host="maps.yandex.ru"/> <data android:host="maps.yandex.ru" />
<data android:host="maps.yandex.com"/> <data android:host="maps.yandex.com" />
<data android:host="www.openstreetmap.org"/> <data android:host="www.openstreetmap.org" />
<data android:host="openstreetmap.org"/> <data android:host="openstreetmap.org" />
<data android:host="osm.org"/> <data android:host="osm.org" />
<data android:host="map.baidu.cn"/> <data android:host="map.baidu.cn" />
<data android:host="map.baidu.com"/> <data android:host="map.baidu.com" />
<data android:host="wb.amap.com"/> <data android:host="wb.amap.com" />
<data android:host="www.amap.com"/> <data android:host="www.amap.com" />
<data android:host="here.com"/> <data android:host="here.com" />
<data android:host="www.here.com"/> <data android:host="www.here.com" />
<data android:host="share.here.com"/> <data android:host="share.here.com" />
<data android:host="map.wap.qq.com"/> <data android:host="map.wap.qq.com" />
<data android:host="map.qq.com"/> <data android:host="map.qq.com" />
<data android:host="maps.apple.com"/> <data android:host="maps.apple.com" />
<action android:name="android.intent.action.VIEW" />
<action android:name="android.intent.action.VIEW"/> <category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<data <data android:scheme="http" android:host="www.google.com" android:pathPrefix="/maps" />
android:host="www.google.com" <data android:scheme="https" android:host="www.google.com" android:pathPrefix="/maps" />
android:pathPrefix="/maps" <action android:name="android.intent.action.VIEW" />
android:scheme="http"/> <category android:name="android.intent.category.DEFAULT" />
<data <category android:name="android.intent.category.BROWSABLE" />
android:host="www.google.com"
android:pathPrefix="/maps"
android:scheme="https"/>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<data <data android:scheme="http" android:host="openstreetmap.de" android:pathPrefix="/karte" />
android:host="openstreetmap.de" <data android:scheme="https" android:host="openstreetmap.de" android:pathPrefix="/karte" />
android:pathPrefix="/karte" <action android:name="android.intent.action.VIEW" />
android:scheme="http"/> <category android:name="android.intent.category.DEFAULT" />
<data <category android:name="android.intent.category.BROWSABLE" />
android:host="openstreetmap.de"
android:pathPrefix="/karte"
android:scheme="https"/>
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<data <data android:scheme="http" android:host="download.osmand.net" android:pathPrefix="/go" />
android:host="download.osmand.net" <data android:scheme="http" android:host="download.osmand.net" android:pathPrefix="go" />
android:pathPrefix="/go" <action android:name="android.intent.action.VIEW" />
android:scheme="http"/> <category android:name="android.intent.category.DEFAULT" />
<data <category android:name="android.intent.category.BROWSABLE" />
android:host="download.osmand.net" <category android:name="android.intent.category.APP_MAPS" />
android:pathPrefix="go" <category android:name="android.intent.category.CAR_MODE" />
android:scheme="http"/> <category android:name="android.intent.category.CAR_DOCK" />
<category android:name="android.intent.category.DESK_DOCK" />
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
<category android:name="android.intent.category.APP_MAPS"/>
<category android:name="android.intent.category.CAR_MODE"/>
<category android:name="android.intent.category.CAR_DOCK"/>
<category android:name="android.intent.category.DESK_DOCK"/>
</intent-filter> </intent-filter>
<!-- requires read permission --> <!-- requires read permission -->
<!-- <!--
@ -438,42 +257,36 @@
</intent-filter> </intent-filter>
--> -->
</activity> </activity>
<activity android:name=".development.TestVoiceActivity"/>
<activity <activity android:name="net.osmand.plus.development.TestVoiceActivity" />
android:name=".download.DownloadActivity" <activity android:name="net.osmand.plus.download.DownloadActivity" android:label="" />
android:label=""/>
<!-- keep android:process on a separate line !! --> <!-- keep android:process on a separate line !! -->
<service <service
android:name=".NavigationService"
android:label="@string/process_navigation_service"
android:process="net.osmand.plus" android:process="net.osmand.plus"
android:label="@string/process_navigation_service"
android:name="net.osmand.plus.NavigationService"
android:stopWithTask="false"> android:stopWithTask="false">
<intent-filter> <intent-filter>
<action android:name="net.osmand.plus.NavigationService"/> <action android:name="net.osmand.plus.NavigationService" />
</intent-filter> </intent-filter>
</service> </service>
<receiver android:name=".OnNavigationServiceAlarmReceiver"/> <receiver android:name="net.osmand.plus.OnNavigationServiceAlarmReceiver" />
<activity android:name="net.osmand.plus.activities.PrintDialogActivity" />
<activity android:name=".activities.PrintDialogActivity"/>
<receiver <receiver
android:name=".DeviceAdminRecv" android:name="net.osmand.plus.DeviceAdminRecv"
android:label="@string/app_name" android:label="@string/app_name"
android:permission="android.permission.BIND_DEVICE_ADMIN"> android:permission="android.permission.BIND_DEVICE_ADMIN" >
<meta-data <meta-data
android:name="android.app.device_admin" android:name="android.app.device_admin"
android:resource="@xml/device_admin"/> android:resource="@xml/device_admin" />
<intent-filter> <intent-filter>
<action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/> <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
<action android:name="android.app.action.DEVICE_ADMIN_DISABLED"/> <action android:name="android.app.action.DEVICE_ADMIN_DISABLED" />
</intent-filter> </intent-filter>
</receiver> </receiver>
</application>
<activity android:name=".liveupdates.LiveUpdatesActivity">
</activity>
</application>
</manifest> </manifest>