From 184552932e268f96e9851498fa68d6d7e75868ed Mon Sep 17 00:00:00 2001 From: Ricky Barrette Date: Sun, 4 Mar 2012 14:03:04 -0500 Subject: [PATCH] Updated Map based classes updated map_fragment.xml to TC release api key updated MidPoint to be final updated UserOverlayBase to synchronize the animation thread abort method, and made mUserArrow volatile Change-Id: Ie79d2c8edb08b7cfdbd130a63e34d0e9ce62eb0e Signed-off-by: Ricky Barrette --- LocationLib/bin/locationlib.jar | Bin 53453 -> 53456 bytes LocationLib/res/layout/map_fragment.xml | 3 +-- .../android/location/MidPoint.java | 2 +- .../android/location/UserOverlayBase.java | 13 ++++++++++--- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/LocationLib/bin/locationlib.jar b/LocationLib/bin/locationlib.jar index 2841e46fba94a0d626b2b4a1b139ea867d2341b3..c0fe8284435cde35490c5bcb2174ed813659172d 100644 GIT binary patch delta 3394 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 delta 3359 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 - + android:apiKey="0rKmsWMM0D-K15bEM_kwabPbNhsn4dp4rcq2q5Q" /> \ No newline at end of file diff --git a/LocationLib/src/com/TwentyCodes/android/location/MidPoint.java b/LocationLib/src/com/TwentyCodes/android/location/MidPoint.java index 1325b4e..96408f0 100644 --- a/LocationLib/src/com/TwentyCodes/android/location/MidPoint.java +++ b/LocationLib/src/com/TwentyCodes/android/location/MidPoint.java @@ -11,7 +11,7 @@ import com.google.android.maps.GeoPoint; * This MidPoint object will hold the information form the calculations performed by GeoUtils.midPoint(). * @author ricky barrette */ -public class MidPoint { +public final class MidPoint { private final int mMinLatitude; private final int mMaxLatitude; diff --git a/LocationLib/src/com/TwentyCodes/android/location/UserOverlayBase.java b/LocationLib/src/com/TwentyCodes/android/location/UserOverlayBase.java index 2f842ce..e20ac41 100644 --- a/LocationLib/src/com/TwentyCodes/android/location/UserOverlayBase.java +++ b/LocationLib/src/com/TwentyCodes/android/location/UserOverlayBase.java @@ -43,7 +43,7 @@ public abstract class UserOverlayBase extends Overlay implements GeoPointLocatio private boolean isAborted; - public void abort(){ + public synchronized void abort(){ isAborted = true; } @@ -104,10 +104,10 @@ public abstract class UserOverlayBase extends Overlay implements GeoPointLocatio } } + private final String TAG = "UserOverlayBase"; private boolean isEnabled; - private int mUserArrow = R.drawable.user_arrow_animation_1; - + private volatile int mUserArrow = R.drawable.user_arrow_animation_1; private AnimationThread mAnimationThread; private float mBearing = 0; private int mAccuracy; @@ -508,6 +508,13 @@ public abstract class UserOverlayBase extends Overlay implements GeoPointLocatio mCompass.setDestination(destination); } +// /** +// * Sets whether or not the users location is enabled +// * @param isEnabled +// * @author ricky barrette +// */ +// public abstract void setMyLocationEnabled(boolean isEnabled); + /** * UnResgisters the listener. after this call you will no longer get location updates * @author Ricky Barrette