This commit is contained in:
madwasp79 2019-05-07 16:11:50 +03:00
parent 1bcd7f7bf6
commit f0866caba3
2 changed files with 741 additions and 910 deletions

View file

@ -1,16 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="net.osmand.plus"
android:installLocation="auto">
<uses-sdk
android:targetSdkVersion="26"
tools:overrideLibrary="com.getkeepsafe.taptargetview, studio.carbonylgroup.textfieldboxes, android.support.customtabs"/>
android:installLocation="auto"
package="net.osmand.plus">
<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" />
@ -21,156 +18,83 @@
<uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="com.android.vending.BILLING" />
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/> <!-- The next 2 seem necessary only for Android < v4.2 (to initialize BT SCO) -->
<uses-permission
android:maxSdkVersion="18"
android:name="android.permission.BROADCAST_STICKY"/>
<uses-permission
android:maxSdkVersion="18"
android:name="android.permission.BLUETOOTH"/>
<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"/>
<uses-feature
android:name="android.hardware.bluetooth"
android:required="false"/>
<uses-feature
android:name="com.sec.feature.spen_usp"
android:required="false"/>
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
<!-- The next 2 seem necessary only for Android < v4.2 (to initialize BT SCO) -->
<uses-permission android:name="android.permission.BROADCAST_STICKY" android:maxSdkVersion="18" />
<uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="18" />
<supports-screens
android:anyDensity="true"
android:largeScreens="true"
android:normalScreens="true"
android:resizeable="true"
android:smallScreens="true"
android:xlargeScreens="true"/>
<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" />
<uses-feature android:name="android.hardware.bluetooth" android:required="false" />
<uses-feature android:name="com.sec.feature.spen_usp" android:required="false"/>
<application
android:allowBackup="true"
android:backupAgent=".OsmandBackupAgent"
android:configChanges="locale"
android:icon="@mipmap/icon"
android:label="@string/app_name"
android:largeHeap="true"
android:name=".OsmandApplication"
android:restoreAnyVersion="true"
android:theme="@style/OsmandDarkTheme">
<uses-sdk android:targetSdkVersion="26"
tools:overrideLibrary="com.getkeepsafe.taptargetview, studio.carbonylgroup.textfieldboxes, android.support.customtabs"/>
<supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true"
android:xlargeScreens="true" android:anyDensity="true" />
<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="@mipmap/icon"
android:value=""/>
<meta-data
android:name="com.sec.minimode.icon.landscape.normal"
android:resource="@mipmap/icon"
android:value=""/>
<!-- android:theme="@style/OsmandLightDarkActionBarTheme" -->
<application android:allowBackup="true" android:backupAgent="net.osmand.plus.OsmandBackupAgent"
android:icon="@mipmap/icon" android:label="@string/app_name"
android:name="net.osmand.plus.OsmandApplication" android:configChanges="locale"
android:theme="@style/OsmandDarkTheme" android:restoreAnyVersion="true" android:largeHeap="true">
<activity android:name=".activities.HelpActivity"/>
<activity android:name=".activities.ExitActivity"/>
<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="@mipmap/icon" android:value="" />
<meta-data android:name="com.sec.minimode.icon.landscape.normal" android:resource="@mipmap/icon" android:value="" />
<activity android:name="net.osmand.plus.activities.HelpActivity" />
<activity android:name="net.osmand.plus.activities.ExitActivity" />
<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="net.osmand.plus.fileprovider"
android:exported="false"
android:grantUriPermissions="true"
android:name="android.support.v4.content.FileProvider">
android:grantUriPermissions="true" >
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/paths" />
</provider>
<activity
android:label="@string/app_name"
android:launchMode="singleTask"
android:name=".activities.MapActivity"
android:screenOrientation="unspecified"
android:theme="@style/FirstSplashScreenPlus"
android:windowSoftInputMode="adjustResize">
<activity android:name="net.osmand.plus.activities.MapActivity" android:label="@string/app_name" android:theme="@style/FirstSplashScreenPlus"
android:screenOrientation="unspecified" android:launchMode="singleTask" android:windowSoftInputMode="adjustResize">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
<data
android:host="*"
android:mimeType="binary/octet-stream"
android:scheme="content"/>
<data
android:host="*"
android:mimeType="application/octet-stream"
android:scheme="content"/>
<data android:scheme="content" android:host="*" android:mimeType="binary/octet-stream" />
<data android:scheme="content" android:host="*" android:mimeType="application/octet-stream" />
</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" />
@ -178,13 +102,12 @@
<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" />
@ -193,23 +116,20 @@
<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 -->
<!--
Capture file open requests (pathPattern is honoured) where no MIME type is provided in the Intent. An Intent with a null
<!-- Capture file open requests (pathPattern is honoured) where no MIME type is provided in the Intent. An Intent with a null
MIME type will never be matched by a filter with a set MIME type, so we need a second intent-filter if we wish to also
match files with this extension and a non-null MIME type (even if it is non-null but zero length).
https://stackoverflow.com/a/31028507/4654078
-->
https://stackoverflow.com/a/31028507/4654078 -->
<intent-filter
android:label="@string/app_name"
android:priority="50">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="file"/>
<data android:scheme="content"/>
<data android:host="*"/>
@ -219,14 +139,13 @@
<data android:pathPattern=".*\\..*\\..*\\..*\\.gpx" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gpx" />
</intent-filter>
<intent-filter
android:label="@string/app_name"
android:priority="50">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="file"/>
<data android:scheme="content"/>
<data android:host="*"/>
@ -237,14 +156,13 @@
<data android:pathPattern=".*\\..*\\..*\\..*\\.gpx" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gpx" />
</intent-filter>
<intent-filter
android:label="@string/app_name"
android:priority="50">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="content"/>
<data android:scheme="file"/>
<data android:scheme="data"/>
@ -257,14 +175,13 @@
<data android:pathPattern=".*\\..*\\..*\\..*\\.kml" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kml" />
</intent-filter>
<intent-filter
android:label="@string/app_name"
android:priority="50">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="content"/>
<data android:scheme="file"/>
<data android:scheme="data"/>
@ -276,14 +193,13 @@
<data android:pathPattern=".*\\..*\\..*\\..*\\.kmz" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kmz" />
</intent-filter>
<intent-filter
android:label="@string/app_name"
android:priority="50">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="file"/>
<data android:host="*"/>
<data android:mimeType="*/*"/>
@ -293,14 +209,13 @@
<data android:pathPattern=".*\\..*\\..*\\..*\\.kmz" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kmz" />
</intent-filter>
<intent-filter
android:label="@string/app_name"
android:priority="50">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="file"/>
<data android:host="*"/>
<data android:pathPattern=".*\\.obf" />
@ -309,14 +224,13 @@
<data android:pathPattern=".*\\..*\\..*\\..*\\.obf" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.obf" />
</intent-filter>
<intent-filter
android:label="@string/app_name"
android:priority="50">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="file"/>
<data android:host="*"/>
<data android:mimeType="*/*"/>
@ -326,14 +240,13 @@
<data android:pathPattern=".*\\..*\\..*\\..*\\.obf" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.obf" />
</intent-filter>
<intent-filter
android:label="@string/app_name"
android:priority="50">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="file"/>
<data android:host="*"/>
<data android:pathPattern=".*\\.sqlitedb" />
@ -342,14 +255,13 @@
<data android:pathPattern=".*\\..*\\..*\\..*\\.sqlitedb" />
<data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.sqlitedb" />
</intent-filter>
<intent-filter
android:label="@string/app_name"
android:priority="50">
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data android:scheme="content"/>
<data android:scheme="file"/>
<data android:scheme="data"/>
@ -366,18 +278,14 @@
<!--trying to handle emails-->
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT"/>
<data android:mimeType="application/gpx+xml" />
</intent-filter>
<!-- google navigation intent -->
<intent-filter>
<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>
@ -385,111 +293,69 @@
<!-- osmand api -->
<intent-filter>
<data android:scheme="osmand.api" />
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<receiver android:name=".audionotes.MediaRemoteControlReceiver">
<receiver android:name="net.osmand.plus.audionotes.MediaRemoteControlReceiver">
<intent-filter>
<action android:name="android.intent.action.CAMERA_BUTTON" />
<!-- <action android:name="android.intent.action.MEDIA_BUTTON" /> -->
</intent-filter>
</receiver>
<activity
android:configChanges="keyboardHidden|orientation"
android:label="@string/shared_string_settings"
android:name=".activities.SettingsActivity"/>
<activity
android:configChanges="keyboardHidden|orientation"
android:name=".activities.SettingsGeneralActivity"/>
<activity
android:configChanges="keyboardHidden|orientation"
android:name=".activities.SettingsNavigationActivity"/>
<activity
android:configChanges="keyboardHidden|orientation"
android:name=".monitoring.SettingsMonitoringActivity"/>
<activity
android:configChanges="keyboardHidden|orientation"
android:name=".rastermaps.SettingsRasterMapsActivity"/>
<activity
android:configChanges="keyboardHidden|orientation"
android:name=".osmedit.SettingsOsmEditingActivity"/>
<activity
android:configChanges="keyboardHidden|orientation"
android:name=".development.SettingsDevelopmentActivity"/>
<activity
android:configChanges="keyboardHidden|orientation"
android:name=".audionotes.SettingsAudioVideoActivity"/>
<activity
android:configChanges="keyboardHidden|orientation"
android:name="net.osmand.access.SettingsAccessibilityActivity"/>
<activity
android:label="@string/search_activity"
android:name=".activities.search.SearchActivity"/>
<activity
android:label="@string/favourites_list_activity"
android:name=".activities.FavoritesListActivity"/>
<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:configChanges="keyboardHidden|orientation"
android:label="@string/contribution_activity"
android:name=".activities.ContributionVersionActivity"/>
<activity
android:configChanges="keyboardHidden|orientation"
android:name=".osmo.SettingsOsMoActivity"/>
<activity android:name=".osmo.OsMoGroupsActivity">
<activity android:name="net.osmand.plus.activities.SettingsActivity" android:label="@string/shared_string_settings" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.plus.activities.SettingsGeneralActivity" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.plus.activities.SettingsNavigationActivity" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.plus.monitoring.SettingsMonitoringActivity" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.plus.rastermaps.SettingsRasterMapsActivity" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.plus.osmedit.SettingsOsmEditingActivity" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.plus.development.SettingsDevelopmentActivity" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.plus.audionotes.SettingsAudioVideoActivity" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.access.SettingsAccessibilityActivity" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.plus.activities.search.SearchActivity" android:label="@string/search_activity" />
<activity android:name="net.osmand.plus.activities.FavoritesListActivity" android:label="@string/favourites_list_activity" />
<activity android:name=".myplaces.FavoritesActivity" android:windowSoftInputMode="adjustPan" />
<activity android:name="net.osmand.plus.activities.TrackActivity"/>
<activity android:name="net.osmand.plus.activities.PluginsActivity" />
<activity android:name="net.osmand.plus.activities.PluginActivity" />
<activity android:name="net.osmand.plus.activities.ContributionVersionActivity" android:configChanges="keyboardHidden|orientation" android:label="@string/contribution_activity" />
<activity android:name="net.osmand.plus.osmo.SettingsOsMoActivity" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.plus.osmo.OsMoGroupsActivity">
<intent-filter>
<data
android:host="z.osmo.mobi"
android:scheme="http"/>
<data android:scheme="http" android:host="z.osmo.mobi" />
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
</intent-filter>
</activity>
<activity
android:label="@string/searchpoi_activity"
android:name=".activities.search.SearchPOIActivity"/>
<activity
android:label="@string/select_address_activity"
android:name=".activities.search.SearchAddressActivity"/>
<activity android:name=".activities.search.SearchCityByNameActivity"/>
<activity android:name=".activities.search.SearchRegionByNameActivity"/>
<activity android:name=".activities.search.SearchStreetByNameActivity"/>
<activity android:name=".activities.search.SearchStreet2ByNameActivity"/>
<activity android:name=".activities.search.SearchBuildingByNameActivity"/>
<activity
android:exported="true"
android:label="Sherpafy"
android:launchMode="singleInstance"
android:name=".sherpafy.TourViewActivity"/>
<activity android:name=".activities.EditPOIFilterActivity"/>
<activity
android:label="@string/app_name"
android:name=".activities.search.GeoIntentActivity">
<activity android:name="net.osmand.plus.activities.search.SearchPOIActivity" android:label="@string/searchpoi_activity" />
<activity android:name="net.osmand.plus.activities.search.SearchAddressActivity" android:label="@string/select_address_activity" />
<activity android:name="net.osmand.plus.activities.search.SearchCityByNameActivity" />
<activity android:name="net.osmand.plus.activities.search.SearchRegionByNameActivity" />
<activity android:name="net.osmand.plus.activities.search.SearchStreetByNameActivity" />
<activity android:name="net.osmand.plus.activities.search.SearchStreet2ByNameActivity" />
<activity android:name="net.osmand.plus.activities.search.SearchBuildingByNameActivity" />
<activity android:name="net.osmand.plus.sherpafy.TourViewActivity" android:exported="true"
android:launchMode= "singleInstance" android:label="Sherpafy" />
<activity android:name="net.osmand.plus.activities.EditPOIFilterActivity" />
<activity android:name="net.osmand.plus.activities.search.GeoIntentActivity" android:label="@string/app_name">
<intent-filter>
<data android:scheme="osmand.geo" />
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
<data android:scheme="geo" />
<action android:name="android.intent.action.VIEW"/>
<category android:name="android.intent.category.DEFAULT"/>
<category android:name="android.intent.category.BROWSABLE"/>
</intent-filter>
@ -498,30 +364,14 @@
<data android:scheme="https" />
<data android:host="maps.yandex.ru" />
<data android:host="maps.yandex.com" />
<data
android:host="www.openstreetmap.org"
android:path="/"/> <!-- catches /#map=... -->
<data
android:host="www.openstreetmap.org"
android:pathPrefix="/query"/>
<data
android:host="www.openstreetmap.org"
android:pathPrefix="/go"/>
<data
android:host="www.openstreetmap.org"
android:pathPrefix="/search"/>
<data
android:host="openstreetmap.org"
android:path="/"/> <!-- catches /#map=... -->
<data
android:host="openstreetmap.org"
android:pathPrefix="/query"/>
<data
android:host="openstreetmap.org"
android:pathPrefix="/go"/>
<data
android:host="openstreetmap.org"
android:pathPrefix="/search"/>
<data android:host="www.openstreetmap.org" android:path="/"/> <!-- catches /#map=... -->
<data android:host="www.openstreetmap.org" android:pathPrefix="/query"/>
<data android:host="www.openstreetmap.org" android:pathPrefix="/go"/>
<data android:host="www.openstreetmap.org" android:pathPrefix="/search"/>
<data android:host="openstreetmap.org" android:path="/"/> <!-- catches /#map=... -->
<data android:host="openstreetmap.org" android:pathPrefix="/query"/>
<data android:host="openstreetmap.org" android:pathPrefix="/go"/>
<data android:host="openstreetmap.org" android:pathPrefix="/search"/>
<data android:host="osm.org" />
<data android:host="map.baidu.cn" />
<data android:host="map.baidu.com" />
@ -533,39 +383,21 @@
<data android:host="map.wap.qq.com" />
<data android:host="map.qq.com" />
<data android:host="maps.apple.com" />
<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>
<data
android:host="openstreetmap.de"
android:pathPrefix="/karte"
android:scheme="http"/>
<data
android:host="openstreetmap.de"
android:pathPrefix="/karte"
android:scheme="https"/>
<data android:scheme="http" android:host="openstreetmap.de" android:pathPrefix="/karte" />
<data android:scheme="https" android:host="openstreetmap.de" android:pathPrefix="/karte" />
<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>
<data
android:host="download.osmand.net"
android:pathPrefix="/go"
android:scheme="http"/>
<data
android:host="download.osmand.net"
android:pathPrefix="go"
android:scheme="http"/>
<data android:scheme="http" android:host="download.osmand.net" android:pathPrefix="/go" />
<data android:scheme="http" android:host="download.osmand.net" 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" />
@ -804,7 +636,9 @@
<data android:scheme="http" />
<data android:scheme="https" />
<data android:pathPrefix="/maps" />
<data android:host="www.google.ac" />
<data android:host="www.google.ad" />
<data android:host="www.google.ae" />
@ -1010,45 +844,42 @@
<data android:host="www.google.ws" />
</intent-filter>
</activity>
<activity android:name=".development.TestVoiceActivity"/>
<activity
android:label=""
android:name=".download.DownloadActivity"/> <!-- keep android:process on a separate line !! -->
<activity android:name="net.osmand.plus.development.TestVoiceActivity" />
<activity android:name="net.osmand.plus.download.DownloadActivity" android:label="" />
<!-- keep android:process on a separate line !! -->
<service
android:label="@string/process_navigation_service"
android:name=".NavigationService"
android:process="net.osmand.plus"
android:label="@string/process_navigation_service"
android:name="net.osmand.plus.NavigationService"
android:stopWithTask="false">
<intent-filter>
<action android:name="net.osmand.plus.NavigationService" />
</intent-filter>
</service>
<service
android:exported="true"
android:name="net.osmand.aidl.OsmandAidlService">
<service android:name="net.osmand.aidl.OsmandAidlService" android:exported="true" >
<intent-filter>
<action android:name="net.osmand.aidl.OsmandAidlService"/>
<category android:name="android.intent.category.DEFAULT"/>
</intent-filter>
</service>
<receiver android:name=".OnNavigationServiceAlarmReceiver"/>
<receiver android:name=".notifications.NotificationDismissReceiver"/>
<receiver android:name="net.osmand.plus.OnNavigationServiceAlarmReceiver" />
<receiver android:name="net.osmand.plus.notifications.NotificationDismissReceiver" />
<activity android:name=".activities.PrintDialogActivity"/>
<activity
android:label="@string/osm_live"
android:name=".liveupdates.OsmLiveActivity"/>
<activity android:name="net.osmand.plus.activities.PrintDialogActivity" />
<activity android:name=".liveupdates.OsmLiveActivity"
android:label="@string/osm_live"/>
<activity android:name=".wikivoyage.explore.WikivoyageExploreActivity">
<intent-filter>
<data android:scheme="http" />
<data android:scheme="https" />
<data android:host="osmand.net" />
<data android:pathPrefix="/travel" />
<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" />
@ -1056,9 +887,11 @@
<category android:name="android.intent.category.CAR_DOCK" />
<category android:name="android.intent.category.DESK_DOCK" />
</intent-filter>
</activity>
<receiver android:name=".liveupdates.LiveUpdatesAlarmReceiver"/>
<receiver android:name="net.osmand.plus.liveupdates.LiveUpdatesAlarmReceiver"/>
<activity
android:configChanges="keyboardHidden|orientation"
@ -1070,7 +903,8 @@
android:label="Application profiles"
/>
</application>
</manifest>

View file

@ -145,13 +145,10 @@ public class EditProfileFragment extends BaseOsmAndFragment {
title = profile.getUserProfileTitle();
profileNameEt.setText(title);
startIconId = profile.iconId;
} else if (isNew) {
isDataChanged = true;
title = String
.format("Custom %s", getResources().getString(profile.parent.getStringResource()));
// profileNameEt.setText(title);
//profileNameEt.selectAll();
startIconId = profile.getParent().getSmallIconDark();
profile.setIconId(startIconId);
} else if (profile.getKey() != -1) {