Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #794 from ximex/master

Browse source 
Reformat Manifest File
This commit is contained in:
vshcherb 2014-07-31 14:18:49 +02:00
commit 8e14c3c1d1
3 changed files with 234 additions and 230 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

318
OsmAnd/AndroidManifest.xml
View file

@ -1,194 +1,200 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
android:versionName="@string/app_version" android:installLocation="auto" android:versionName="@string/app_version" android:versionCode="191"
android:versionCode="191"
package="net.osmand.plus"> package="net.osmand.plus">
<uses-sdk android:minSdkVersion="7" android:targetSdkVersion="19"/> <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="19" />
<uses-feature android:name="android.hardware.camera" android:required="false" />
<uses-feature android:name="android.hardware.microphone" android:required="false"/>
<uses-feature android:name="android.hardware.camera.autofocus" 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-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.INTERNET"></uses-permission> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE"></uses-permission> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
<uses-permission android:name="android.permission.STORAGE" /> <uses-permission android:name="android.permission.STORAGE" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WAKE_LOCK"></uses-permission> <uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.CAMERA"></uses-permission> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE" />
<uses-permission android:name="android.permission.RECORD_AUDIO"></uses-permission> <uses-permission android:name="android.permission.RECORD_AUDIO" />
<supports-screens android:resizeable="true" android:smallScreens="true" android:normalScreens="true" android:largeScreens="true"
android:xlargeScreens="true" android:anyDensity="true" />
<!-- android:theme="@style/OsmandLightDarkActionBarTheme" -->
<application android:icon="@drawable/icon" android:label="@string/app_name"
android:debuggable="true" android:name="net.osmand.plus.OsmandApplication" android:configChanges="locale"
android:theme="@style/OsmandDarkTheme"
android:backupAgent="net.osmand.plus.OsmandBackupAgent" android:restoreAnyVersion="true" android:largeHeap="true">
<meta-data android:name="com.google.android.backup.api_key"
android:value="AEdPqrEAAAAIqF3tNGT66etVBn_vgzpfAY1wmIzKV1Ss6Ku-2A"/> <uses-feature android:name="android.hardware.camera" android:required="false" />
<meta-data android:name="com.sec.android.support.multiwindow" android:value="true"/> <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_W" android:resource="@dimen/app_defaultsize_w" android:value=""/> <uses-feature android:name="android.hardware.microphone" android:required="false" />
<meta-data android:name="com.sec.android.multiwindow.DEFAULT_SIZE_H" android:resource="@dimen/app_defaultsize_h" android:value=""/> <uses-feature android:name="android.hardware.wifi" android:required="false" />
<meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_W" android:resource="@dimen/app_minimumsize_w" android:value=""/> <uses-feature android:name="android.hardware.location" android:required="false" />
<meta-data android:name="com.sec.android.multiwindow.MINIMUM_SIZE_H" android:resource="@dimen/app_minimumsize_h" android:value=""/> <uses-feature android:name="android.hardware.location.network" android:required="false" />
<meta-data android:name="com.sec.minimode.icon.portrait.normal" android:resource="@drawable/icon" android:value=""/> <uses-feature android:name="android.hardware.location.gps" android:required="false" />
<meta-data android:name="com.sec.minimode.icon.landscape.normal" android:resource="@drawable/icon" android:value=""/> <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" />
<activity android:name="net.osmand.plus.activities.MainMenuActivity" <uses-feature android:name="android.hardware.sensor.gyroscope" android:required="false" />
android:label="@string/app_name"> <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:theme="@style/OsmandLightDarkActionBarTheme" -->
<application android:allowBackup="true" android:backupAgent="net.osmand.plus.OsmandBackupAgent"
android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="true"
android:name="net.osmand.plus.OsmandApplication" android:configChanges="locale"
android:theme="@style/OsmandDarkTheme" android:restoreAnyVersion="true" android:largeHeap="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="@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.MainMenuActivity" android:label="@string/app_name">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
<category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" /> <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>
<activity android:name="net.osmand.plus.activities.HelpActivity"></activity>
<activity android:name="net.osmand.plus.activities.MapActivity" android:label="@string/app_name" android:screenOrientation="unspecified" <activity android:name="net.osmand.plus.activities.HelpActivity" />
android:launchMode="singleTop">
<activity android:name="net.osmand.plus.activities.MapActivity" android:label="@string/app_name"
android:screenOrientation="unspecified" android:launchMode="singleTop">
<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="binary/octet-stream" />
<data android:scheme="content" android:host="*" android:mimeType="application/octet-stream" /> <data android:scheme="content" android:host="*" android:mimeType="application/octet-stream" />
</intent-filter> </intent-filter>
<intent-filter> <intent-filter>
<data android:scheme="http" android:host="download.osmand.net" android:path="go"/> <data android:scheme="http" android:host="download.osmand.net" android:path="go" />
<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" />
<category android:name="android.intent.category.APP_MAPS" /> <category android:name="android.intent.category.APP_MAPS" />
<category android:name="android.intent.category.CAR_MODE" /> <category android:name="android.intent.category.CAR_MODE" />
<category android:name="android.intent.category.CAR_DOCK" /> <category android:name="android.intent.category.CAR_DOCK" />
<category android:name="android.intent.category.DESK_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--> <!-- 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 android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\.gpx"/> <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\.gpx" />
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\.gpx"/> <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\.gpx" />
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\.gpx"/> <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\.gpx" />
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gpx"/> <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\..*\\.gpx" />
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.kml"/> <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\.kml" />
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\.kml"/> <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\.kml" />
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\.kml"/> <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\.kml" />
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\.kml"/> <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\.kml" />
<data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kml"/> <data android:scheme="file" android:host="*" android:mimeType="*/*" android:pathPattern=".*\\..*\\..*\\..*\\..*\\.kml" />
</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="google.navigation" />
<data android:scheme="osmand.navigation"/> <data android:scheme="osmand.navigation" />
</intent-filter> </intent-filter>
</activity> </activity>
<receiver android:name="net.osmand.plus.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 android:name="net.osmand.plus.activities.SettingsActivity" android:label="@string/settings_activity" android:configChanges="keyboardHidden|orientation"></activity>
<activity android:name="net.osmand.plus.activities.SettingsGeneralActivity" android:configChanges="keyboardHidden|orientation"></activity>
<activity android:name="net.osmand.plus.activities.SettingsNavigationActivity" android:configChanges="keyboardHidden|orientation"></activity>
<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"></activity>
<activity android:name="net.osmand.plus.routepointsnavigation.RoutePointsActivity"/>
<activity android:name="net.osmand.plus.osmedit.SettingsOsmEditingActivity" android:configChanges="keyboardHidden|orientation"></activity> <activity android:name="net.osmand.plus.activities.SettingsActivity" android:label="@string/settings_activity" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.plus.development.SettingsDevelopmentActivity" android:configChanges="keyboardHidden|orientation"></activity> <activity android:name="net.osmand.plus.activities.SettingsGeneralActivity" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.plus.audionotes.SettingsAudioVideoActivity" android:configChanges="keyboardHidden|orientation"></activity> <activity android:name="net.osmand.plus.activities.SettingsNavigationActivity" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.access.SettingsAccessibilityActivity" android:configChanges="keyboardHidden|orientation"></activity> <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.activities.search.SearchActivity" android:label="@string/search_activity" ></activity> <activity android:name="net.osmand.plus.routepointsnavigation.RoutePointsActivity" />
<activity android:name="net.osmand.plus.activities.DownloadIndexActivity" android:configChanges="keyboardHidden|orientation" android:label="@string/local_index_download"></activity>
<activity android:name="net.osmand.plus.activities.ShowRouteInfoActivity" android:label="@string/show_route"></activity> <activity android:name="net.osmand.plus.osmedit.SettingsOsmEditingActivity" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.plus.activities.FavouritesListActivity" android:label="@string/favourites_list_activity"></activity> <activity android:name="net.osmand.plus.development.SettingsDevelopmentActivity" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.plus.activities.FavouritesActivity" android:windowSoftInputMode="adjustPan"></activity> <activity android:name="net.osmand.plus.audionotes.SettingsAudioVideoActivity" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.plus.activities.PluginsActivity"></activity> <activity android:name="net.osmand.access.SettingsAccessibilityActivity" android:configChanges="keyboardHidden|orientation" />
<activity android:name="net.osmand.plus.activities.ContributionVersionActivity" android:configChanges="keyboardHidden|orientation" android:label="@string/contribution_activity"></activity>
<activity android:name="net.osmand.plus.activities.search.SearchActivity" android:label="@string/search_activity" />
<activity android:name="net.osmand.plus.activities.DownloadIndexActivity" android:configChanges="keyboardHidden|orientation" android:label="@string/local_index_download" />
<activity android:name="net.osmand.plus.osmo.SettingsOsMoActivity" android:configChanges="keyboardHidden|orientation"></activity> <activity android:name="net.osmand.plus.activities.ShowRouteInfoActivity" android:label="@string/show_route" />
<activity android:name="net.osmand.plus.osmo.OsMoGroupsActivity"> <activity android:name="net.osmand.plus.activities.FavouritesListActivity" android:label="@string/favourites_list_activity" />
<intent-filter> <activity android:name="net.osmand.plus.activities.FavouritesActivity" android:windowSoftInputMode="adjustPan" />
<data android:scheme="http" android:host="z.osmo.mobi" /> <activity android:name="net.osmand.plus.activities.PluginsActivity" />
<action android:name="android.intent.action.VIEW" /> <activity android:name="net.osmand.plus.activities.ContributionVersionActivity" android:configChanges="keyboardHidden|orientation" android:label="@string/contribution_activity" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE"></category>
</intent-filter> <activity android:name="net.osmand.plus.osmo.SettingsOsMoActivity" android:configChanges="keyboardHidden|orientation" />
</activity> <activity android:name="net.osmand.plus.osmo.OsMoGroupsActivity">
<intent-filter>
<data android:scheme="http" android:host="z.osmo.mobi" />
<activity android:name="net.osmand.plus.activities.search.SearchPOIActivity" android:label="@string/searchpoi_activity"></activity> <action android:name="android.intent.action.VIEW" />
<activity android:name="net.osmand.plus.activities.search.SearchAddressActivity" android:label="@string/select_address_activity"></activity> <category android:name="android.intent.category.DEFAULT" />
<activity android:name="net.osmand.plus.activities.search.SearchCityByNameActivity"></activity> <category android:name="android.intent.category.BROWSABLE" />
<activity android:name="net.osmand.plus.activities.search.SearchRegionByNameActivity"></activity> </intent-filter>
<activity android:name="net.osmand.plus.activities.search.SearchStreetByNameActivity"></activity> </activity>
<activity android:name="net.osmand.plus.activities.search.SearchStreet2ByNameActivity"></activity>
<activity android:name="net.osmand.plus.activities.search.SearchBuildingByNameActivity"></activity> <activity android:name="net.osmand.plus.activities.search.SearchPOIActivity" android:label="@string/searchpoi_activity" />
<activity android:name="net.osmand.plus.sherpafy.TourViewActivity" android:exported="true" android:launchMode= "singleInstance" <activity android:name="net.osmand.plus.activities.search.SearchAddressActivity" android:label="@string/select_address_activity" />
android:label="Sherpafy"/> <activity android:name="net.osmand.plus.activities.search.SearchCityByNameActivity" />
<activity android:name="net.osmand.plus.activities.EditPOIFilterActivity"></activity> <activity android:name="net.osmand.plus.activities.search.SearchRegionByNameActivity" />
<activity android:name="net.osmand.plus.activities.search.GeoIntentActivity" android:label="@string/app_name"> <activity android:name="net.osmand.plus.activities.search.SearchStreetByNameActivity" />
<intent-filter> <activity android:name="net.osmand.plus.activities.search.SearchStreet2ByNameActivity" />
<data android:scheme="geo" /> <activity android:name="net.osmand.plus.activities.search.SearchBuildingByNameActivity" />
<data android:scheme="osmand.geo" /> <activity android:name="net.osmand.plus.sherpafy.TourViewActivity" android:exported="true"
<action android:name="android.intent.action.VIEW" /> android:launchMode= "singleInstance" android:label="Sherpafy" />
<category android:name="android.intent.category.DEFAULT" /> <activity android:name="net.osmand.plus.activities.EditPOIFilterActivity" />
</intent-filter>
<intent-filter> <activity android:name="net.osmand.plus.activities.search.GeoIntentActivity" android:label="@string/app_name">
<data android:scheme="http" android:host="maps.google.com"/> <intent-filter>
<action android:name="android.intent.action.VIEW"/> <data android:scheme="geo" />
<category android:name="android.intent.category.DEFAULT"/> <data android:scheme="osmand.geo" />
<category android:name="android.intent.category.BROWSABLE"/> <action android:name="android.intent.action.VIEW" />
</intent-filter> <category android:name="android.intent.category.DEFAULT" />
<!-- requires read permission --> </intent-filter>
<!-- <intent-filter>
<intent-filter android:label="OsmAnd"> <data android:scheme="http" android:host="maps.google.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.DEFAULT" />
<data android:mimeType="vnd.android.cursor.item/postal-address_v2" /> <category android:name="android.intent.category.BROWSABLE" />
</intent-filter> </intent-filter>
--> <!-- requires read permission -->
</activity> <!--
<activity android:name="net.osmand.plus.development.TestVoiceActivity"></activity> <intent-filter android:label="OsmAnd">
<activity android:name="net.osmand.plus.activities.LocalIndexesActivity" android:label="@string/local_index_descr_title"></activity> <action android:name="android.intent.action.VIEW" />
<activity android:name="net.osmand.plus.osmedit.LocalOpenstreetmapActivity" android:label="@string/local_openstreetmap_act_title"></activity> <category android:name="android.intent.category.DEFAULT" />
<data android:mimeType="vnd.android.cursor.item/postal-address_v2" />
</intent-filter>
-->
</activity>
<activity android:name="net.osmand.plus.development.TestVoiceActivity" />
<activity android:name="net.osmand.plus.activities.LocalIndexesActivity" android:label="@string/local_index_descr_title" />
<activity android:name="net.osmand.plus.osmedit.LocalOpenstreetmapActivity" android:label="@string/local_openstreetmap_act_title" />
<!-- keep android:process on a separate line !! --> <!-- keep android:process on a separate line !! -->
<service android:process="net.osmand.plus" <service android:process="net.osmand.plus" android:label="@string/process_navigation_service"
android:label="@string/process_navigation_service" android:name="net.osmand.plus.NavigationService"> android:name="net.osmand.plus.NavigationService">
<intent-filter> <intent-filter>
<action android:name="net.osmand.plus.NavigationService"></action> <action android:name="net.osmand.plus.NavigationService" />
</intent-filter> </intent-filter>
</service> </service>
<receiver android:name="net.osmand.plus.OnNavigationServiceAlarmReceiver"/> <receiver android:name="net.osmand.plus.OnNavigationServiceAlarmReceiver" />
<activity android:name="net.osmand.plus.activities.OsmandBidForFixActivity"></activity> <activity android:name="net.osmand.plus.activities.OsmandBidForFixActivity" />
</application> </application>
</manifest> </manifest>

15
OsmAnd/bidforfix.xml
View file

@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8"?>
<Module> <Module>
<ModulePrefs title="hello world example" /> <ModulePrefs title="hello world example" />
<Content type="html"> <Content type="html">
<![CDATA[ <![CDATA[
<iframe src="http://www.bidforfix.com/p/osmand.net/ads/iframe/" <iframe src="http://www.bidforfix.com/p/osmand.net/ads/iframe/"
scrolling="no" frameborder="0" style="border:none; width:600px; height:100px"/> scrolling="no" frameborder="0" style="border:none; width:600px; height:100px" />
]]></Content> ]]>
</Content>
</Module> </Module>

131
OsmAnd/build.xml
View file

@ -7,9 +7,8 @@
<!-- quick check on sdk.dir --> <!-- quick check on sdk.dir -->
<fail <fail
message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var" message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
unless="sdk.dir" unless="sdk.dir" />
/>
<property name="use.dir" value="../OsmAnd-java/src" /> <property name="use.dir" value="../OsmAnd-java/src" />
<property name="use.absolute.dir" location="${use.dir}" /> <property name="use.absolute.dir" location="${use.dir}" />
@ -19,45 +18,45 @@
<target name="copy_resources"> <target name="copy_resources">
<copy todir="assets"> <copy todir="assets">
<fileset dir="../../resources/" > <fileset dir="../../resources/">
<include name="specialphrases/**"/> <include name="specialphrases/**" />
<include name="voice/**/*.p"/> <include name="voice/**/*.p" />
</fileset> </fileset>
</copy> </copy>
<copy todir="res/"> <copy todir="res/">
<fileset dir="../../resources/rendering_styles/style-icons/" > <fileset dir="../../resources/rendering_styles/style-icons/" >
<include name="**/*"/> <include name="**/*" />
</fileset> </fileset>
</copy> </copy>
<copy todir="${src.absolute.dir}/net/osmand/router/"> <copy todir="${src.absolute.dir}/net/osmand/router/">
<fileset dir="../../resources/routing/" > <fileset dir="../../resources/routing/">
<include name="*.xml"/> <include name="*.xml" />
</fileset> </fileset>
</copy> </copy>
<sync todir="assets/help/"> <sync todir="assets/help/">
<fileset dir="../../help/" > <fileset dir="../../help/">
<include name="*.html"/> <include name="*.html" />
<include name="images/**/*.png"/> <include name="images/**/*.png" />
</fileset> </fileset>
</sync> </sync>
<copy todir="assets/help"> <copy todir="assets/help">
<fileset dir="assets/" > <fileset dir="assets/">
<include name="style.css"/> <include name="style.css" />
</fileset> </fileset>
</copy> </copy>
<copy todir="${src.absolute.dir}/net/osmand/render/"> <copy todir="${src.absolute.dir}/net/osmand/render/">
<fileset dir="../../resources/rendering_styles/" > <fileset dir="../../resources/rendering_styles/">
<include name="*.xml"/> <include name="*.xml" />
</fileset> </fileset>
</copy> </copy>
<copy todir="${src.absolute.dir}/net/osmand/osm/"> <copy todir="${src.absolute.dir}/net/osmand/osm/">
<fileset dir="../../resources/obf_creation/" > <fileset dir="../../resources/obf_creation/">
<include name="rendering_types.xml"/> <include name="rendering_types.xml" />
</fileset> </fileset>
</copy> </copy>
<copy todir="${src.absolute.dir}/net/osmand/map/"> <copy todir="${src.absolute.dir}/net/osmand/map/">
<fileset dir="../../resources/countries-info/" > <fileset dir="../../resources/countries-info/">
<include name="regions.ocbf"/> <include name="regions.ocbf" />
</fileset> </fileset>
</copy> </copy>
</target> </target>
@ -76,7 +75,6 @@
<replaceregexp file="res/values/no_translate.xml" match='versionFeatures"&gt;(.*)&lt;' replace='versionFeatures"&gt;${versionFeatures}&lt;' byline="true" /> <replaceregexp file="res/values/no_translate.xml" match='versionFeatures"&gt;(.*)&lt;' replace='versionFeatures"&gt;${versionFeatures}&lt;' byline="true" />
</then> </then>
</if> </if>
<if> <if>
<condition> <condition>
<isset property="net.osmand.sherpafy" /> <isset property="net.osmand.sherpafy" />
@ -89,24 +87,24 @@
</if> </if>
<if> <if>
<condition> <condition>
<isset property="net.osmand" /> <isset property="net.osmand" />
</condition> </condition>
<then> <then>
<property name="package.name" value="net.osmand" /> <property name="package.name" value="net.osmand" />
<property name="app.name" value="OsmAnd" /> <property name="app.name" value="OsmAnd" />
<replaceregexp file="AndroidManifest.xml" match='"@drawable/([^\s]*)"' replace='"@drawable/icon_free"' byline="true" /> <replaceregexp file="AndroidManifest.xml" match='"@drawable/([^\s]*)"' replace='"@drawable/icon_free"' byline="true" />
</then> </then>
</if> </if>
<if> <if>
<condition> <condition>
<isset property="net.osmand.plus" /> <isset property="net.osmand.plus" />
</condition> </condition>
<then> <then>
<property name="package.name" value="net.osmand.plus" /> <property name="package.name" value="net.osmand.plus" />
<property name="app.name" value="OsmAnd+" /> <property name="app.name" value="OsmAnd+" />
<replaceregexp file="AndroidManifest.xml" match='"@drawable/([^\s]*)"' replace='"@drawable/icon"' byline="true" /> <replaceregexp file="AndroidManifest.xml" match='"@drawable/([^\s]*)"' replace='"@drawable/icon"' byline="true" />
</then> </then>
</if> </if>
<if> <if>
<condition> <condition>
<isset property="package.name" /> <isset property="package.name" />
@ -116,9 +114,9 @@
<replaceregexp file="AndroidManifest.xml" match='android:process="(.*)"' replace='android:process="${package.name}"' byline="true" /> <replaceregexp file="AndroidManifest.xml" match='android:process="(.*)"' replace='android:process="${package.name}"' byline="true" />
<replaceregexp file="res/values/no_translate.xml" match='"app_name"&gt;(.*)&lt;' replace='"app_name"&gt;${app.name}&lt;' byline="true" /> <replaceregexp file="res/values/no_translate.xml" match='"app_name"&gt;(.*)&lt;' replace='"app_name"&gt;${app.name}&lt;' byline="true" />
<replaceregexp file="res/layout/search_address.xml" match='xmlns:custom="http://schemas.android.com/apk/res/(.*)"' <replaceregexp file="res/layout/search_address.xml" match='xmlns:custom="http://schemas.android.com/apk/res/(.*)"'
replace='xmlns:custom="http://schemas.android.com/apk/res/${package.name}"' byline="true" /> replace='xmlns:custom="http://schemas.android.com/apk/res/${package.name}"' byline="true" />
<replaceregexp file="res/layout/navigate_point.xml" match='xmlns:custom="http://schemas.android.com/apk/res/(.*)"' <replaceregexp file="res/layout/navigate_point.xml" match='xmlns:custom="http://schemas.android.com/apk/res/(.*)"'
replace='xmlns:custom="http://schemas.android.com/apk/res/${package.name}"' byline="true" /> replace='xmlns:custom="http://schemas.android.com/apk/res/${package.name}"' byline="true" />
</then> </then>
</if> </if>
<if> <if>
@ -128,7 +126,6 @@
<then> <then>
<replaceregexp file="AndroidManifest.xml" match='android:versionCode="(.*)"' replace='android:versionCode="${build.version.code}"' byline="true" /> <replaceregexp file="AndroidManifest.xml" match='android:versionCode="(.*)"' replace='android:versionCode="${build.version.code}"' byline="true" />
<replaceregexp file="AndroidManifest.xml" match='android:debuggable="true"' replace='android:debuggable="false"' byline="true" /> <replaceregexp file="AndroidManifest.xml" match='android:debuggable="true"' replace='android:debuggable="false"' byline="true" />
</then> </then>
</if> </if>
<if> <if>
@ -142,10 +139,10 @@
</target> </target>
<target name="copy_sherpafy"> <target name="copy_sherpafy">
<copy todir="gen/net/osmand/plus"> <copy todir="gen/net/osmand/plus">
<fileset dir="gen/net/osmand/sherpafy"> <fileset dir="gen/net/osmand/sherpafy">
<include name="R.java" /> <include name="R.java" />
</fileset> </fileset>
</copy> </copy>
<replaceregexp file="gen/net/osmand/plus/R.java" match='package (.*);' replace='package net.osmand.plus;' byline="true" /> <replaceregexp file="gen/net/osmand/plus/R.java" match='package (.*);' replace='package net.osmand.plus;' byline="true" />
</target> </target>
@ -153,13 +150,13 @@
<!-- Compiles this project's .java files into .class files. --> <!-- Compiles this project's .java files into .class files. -->
<target name="-compile" depends="-build-setup, -pre-build, -code-gen, -pre-compile"> <target name="-compile" depends="-build-setup, -pre-build, -code-gen, -pre-compile">
<!-- osmchange : Osmand plus support --> <!-- osmchange : Osmand plus support -->
<mkdir dir="${gen.absolute.dir}/net/osmand/plus"/> <mkdir dir="${gen.absolute.dir}/net/osmand/plus" />
<if> <if>
<condition> <condition>
<isset property="net.osmand.sherpafy" /> <isset property="net.osmand.sherpafy" />
</condition> </condition>
<then> <then>
<copy todir="${gen.absolute.dir}/net/osmand/plus"> <copy todir="${gen.absolute.dir}/net/osmand/plus">
<fileset dir="${gen.absolute.dir}/net/osmand/sherpafy"> <fileset dir="${gen.absolute.dir}/net/osmand/sherpafy">
<include name="R.java" /> <include name="R.java" />
</fileset> </fileset>
@ -171,7 +168,7 @@
<isset property="net.osmand" /> <isset property="net.osmand" />
</condition> </condition>
<then> <then>
<copy todir="${gen.absolute.dir}/net/osmand/plus"> <copy todir="${gen.absolute.dir}/net/osmand/plus">
<fileset dir="${gen.absolute.dir}/net/osmand"> <fileset dir="${gen.absolute.dir}/net/osmand">
<include name="R.java" /> <include name="R.java" />
</fileset> </fileset>
@ -206,7 +203,7 @@
<getemmafilter appPackage="${project.app.package}" libraryPackagesRefId="project.library.packages" filterOut="emma.default.filter" /> <getemmafilter appPackage="${project.app.package}" libraryPackagesRefId="project.library.packages" filterOut="emma.default.filter" />
<!-- define where the .em file is going. This may have been <!-- define where the .em file is going. This may have been
setup already if this is a library --> setup already if this is a library -->
<property name="emma.coverage.absolute.file" location="${out.absolute.dir}/coverage.em" /> <property name="emma.coverage.absolute.file" location="${out.absolute.dir}/coverage.em" />
<!-- It only instruments class files, not any external libs --> <!-- It only instruments class files, not any external libs -->
@ -251,45 +248,45 @@
<!-- Import the actual build file. <!-- Import the actual build file.
To customize existing targets, there are two options: To customize existing targets, there are two options:
- Customize only one target: - Customize only one target:
- copy/paste the target into this file, *before* the - copy/paste the target into this file, *before* the
<import> task. <import> task.
- customize it to your needs. - customize it to your needs.
- Customize the whole content of build.xml - Customize the whole content of build.xml
- copy/paste the content of the rules files (minus the top node) - copy/paste the content of the rules files (minus the top node)
into this file, replacing the <import> task. into this file, replacing the <import> task.
- customize to your needs. - customize to your needs.
*********************** ***********************
****** IMPORTANT ****** ****** IMPORTANT ******
*********************** ***********************
In all cases you must update the value of version-tag below to read 'custom' instead of an integer, In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
in order to avoid having your file be overridden by tools such as "android update project" in order to avoid having your file be overridden by tools such as "android update project"
--> -->
<!-- version-tag: custom --> <!-- version-tag: custom -->
<import file="${sdk.dir}/tools/ant/build.xml" /> <import file="${sdk.dir}/tools/ant/build.xml" />
<taskdef name="cpd" classname="net.sourceforge.pmd.cpd.CPDTask" classpathref="lib.path" /> <taskdef name="cpd" classname="net.sourceforge.pmd.cpd.CPDTask" classpathref="lib.path" />
<target name="cpd" description="Search for cut-and-pasted code"> <target name="cpd" description="Search for cut-and-pasted code">
<property name="cpd.report.xml" location="cpd.xml"/> <property name="cpd.report.xml" location="cpd.xml" />
<cpd minimumTokenCount="100" format="xml" outputFile="${cpd.report.xml}" <cpd minimumTokenCount="100" format="xml" outputFile="${cpd.report.xml}"
ignoreLiterals="true" ignoreIdentifiers="true"> ignoreLiterals="true" ignoreIdentifiers="true">
<fileset dir="${source.absolute.dir}" includes="**/*.java"/> <fileset dir="${source.absolute.dir}" includes="**/*.java" />
</cpd> </cpd>
</target> </target>
<target name="fix_apostrophe_issues"> <target name="fix_apostrophe_issues">
<replace token="version='1.0'" value="version=&quot;1.0&quot;"> <replace token="version='1.0'" value="version=&quot;1.0&quot;">
<fileset dir="res" includes="**/strings.xml"/> <fileset dir="res" includes="**/strings.xml" />
</replace> </replace>
<replace token="encoding='utf-8'" value="encoding=&quot;utf-8&quot;"> <replace token="encoding='utf-8'" value="encoding=&quot;utf-8&quot;">
<fileset dir="res" includes="**/strings.xml"/> <fileset dir="res" includes="**/strings.xml" />
</replace> </replace>
<replaceregexp match="([^\\])'" replace="\1\\\\'" flags="-g" byline="off"> <replaceregexp match="([^\\])'" replace="\1\\\\'" flags="-g" byline="off">
<fileset dir="res" includes="**/strings.xml"/> <fileset dir="res" includes="**/strings.xml" />
</replaceregexp> </replaceregexp>
</target> </target>