aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <cbaines8@gmail.com>2012-03-01 12:29:50 +0000
committerChristopher Baines <cbaines8@gmail.com>2012-03-01 12:29:50 +0000
commit4619835948a40c3ecffe3c7001cab295e58e5bdd (patch)
tree6131f09666b73ac5144816798b2c9c8cab4c6174
parent7191f6188d1ce02599430544f0af69d76e74a1ba (diff)
downloadsouthamptonuniversitymap-4619835948a40c3ecffe3c7001cab295e58e5bdd.tar
southamptonuniversitymap-4619835948a40c3ecffe3c7001cab295e58e5bdd.tar.gz
Added the libs I forgot to add properly last commit, also changed versions stuff.
-rw-r--r--AndroidManifest.xml4
-rw-r--r--libs/ormlite-android-4.35.jarbin0 -> 45744 bytes
-rw-r--r--libs/ormlite-core-4.35.jarbin0 -> 256811 bytes
-rw-r--r--project.properties2
-rw-r--r--src/net/cbaines/suma/MapActivity.java2
5 files changed, 6 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index af78fdb..09fd9e7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -4,7 +4,9 @@
android:versionCode="8"
android:versionName="0.5 (alpha)" >
- <uses-sdk android:minSdkVersion="7" />
+ <uses-sdk
+ android:minSdkVersion="7"
+ android:targetSdkVersion="10" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
diff --git a/libs/ormlite-android-4.35.jar b/libs/ormlite-android-4.35.jar
new file mode 100644
index 0000000..e2e0547
--- /dev/null
+++ b/libs/ormlite-android-4.35.jar
Binary files differ
diff --git a/libs/ormlite-core-4.35.jar b/libs/ormlite-core-4.35.jar
new file mode 100644
index 0000000..1a5dd5c
--- /dev/null
+++ b/libs/ormlite-core-4.35.jar
Binary files differ
diff --git a/project.properties b/project.properties
index 5a70945..f049142 100644
--- a/project.properties
+++ b/project.properties
@@ -8,4 +8,4 @@
# project structure.
# Project target.
-target=android-7
+target=android-10
diff --git a/src/net/cbaines/suma/MapActivity.java b/src/net/cbaines/suma/MapActivity.java
index 728591d..9dd927a 100644
--- a/src/net/cbaines/suma/MapActivity.java
+++ b/src/net/cbaines/suma/MapActivity.java
@@ -293,6 +293,7 @@ public class MapActivity extends ToastHelperActivity implements MapViewConstants
if (activityPrefs.getBoolean(OTHER_OVERLAYS + MY_LOCATION_OVERLAY, MY_LOCATION_OVERLAY_ENABLED_BY_DEFAULT)
&& sharedPrefs.getBoolean(GPS_ENABLED, GPS_ENABLED_BY_DEFAULT)) {
+ // The following can cause problems in some emulators,
myLocationOverlay.enableMyLocation();
} else {
myLocationOverlay.disableMyLocation();
@@ -301,6 +302,7 @@ public class MapActivity extends ToastHelperActivity implements MapViewConstants
sharedPrefs.registerOnSharedPreferenceChangeListener(this);
activityPrefs.registerOnSharedPreferenceChangeListener(this);
}
+ Log.i(TAG, "Finished OnResume");
}
public void onPause() {