diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2014-04-05 18:42:53 +0200 |
|---|---|---|
| committer | Samuel Tardieu <sam@rfc1149.net> | 2014-04-05 18:42:53 +0200 |
| commit | b99e9257629872ccceb74065fb0324928a0d4ad7 (patch) | |
| tree | b58c6fe5911cda44876c0591d13490d5d902c3b0 | |
| parent | cca4c9b0bcc1bd7742d419166fd5cfd5415fde9e (diff) | |
| parent | 1b6176191c99afb78a7f7f540866c1e3d686df4c (diff) | |
| download | cgeo-b99e9257629872ccceb74065fb0324928a0d4ad7.zip cgeo-b99e9257629872ccceb74065fb0324928a0d4ad7.tar.gz cgeo-b99e9257629872ccceb74065fb0324928a0d4ad7.tar.bz2 | |
Merge branch 'release' into upstream
| -rw-r--r-- | cgeo-contacts/AndroidManifest.xml | 6 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/maps/CGeoMap.java | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cgeo-contacts/AndroidManifest.xml b/cgeo-contacts/AndroidManifest.xml index 9c070b4..e914118 100644 --- a/cgeo-contacts/AndroidManifest.xml +++ b/cgeo-contacts/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="cgeo.contacts" - android:versionCode="1" - android:versionName="1.0" > + android:versionCode="2" + android:versionName="1.1" > <uses-sdk android:minSdkVersion="5" @@ -36,4 +36,4 @@ </activity> </application> -</manifest>
\ No newline at end of file +</manifest> diff --git a/main/src/cgeo/geocaching/maps/CGeoMap.java b/main/src/cgeo/geocaching/maps/CGeoMap.java index b0124eb..cab961a 100644 --- a/main/src/cgeo/geocaching/maps/CGeoMap.java +++ b/main/src/cgeo/geocaching/maps/CGeoMap.java @@ -29,6 +29,7 @@ import cgeo.geocaching.maps.interfaces.MapProvider; import cgeo.geocaching.maps.interfaces.MapSource; import cgeo.geocaching.maps.interfaces.MapViewImpl; import cgeo.geocaching.maps.interfaces.OnMapDragListener; +import cgeo.geocaching.sensors.DirectionProvider; import cgeo.geocaching.sensors.GeoDirHandler; import cgeo.geocaching.sensors.IGeoData; import cgeo.geocaching.settings.Settings; @@ -894,7 +895,7 @@ public class CGeoMap extends AbstractMap implements OnMapDragListener, ViewFacto locationValid = true; currentLocation = geo.getLocation(); - currentHeading = dir; + currentHeading = DirectionProvider.getDirectionNow(activity, dir); repaintPositionOverlay(); } } |