From 3fe5c2f9fc01258d45c20070e9874d76bc6c8c07 Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Tue, 18 Sep 2012 23:47:50 +1200 Subject: altosdroid: initial implementation of telemetry logging. Signed-off-by: Mike Beattie --- altosdroid/AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'altosdroid/AndroidManifest.xml') diff --git a/altosdroid/AndroidManifest.xml b/altosdroid/AndroidManifest.xml index 12391759..7147c0b1 100644 --- a/altosdroid/AndroidManifest.xml +++ b/altosdroid/AndroidManifest.xml @@ -22,6 +22,7 @@ + -- cgit v1.2.3 From d05a77992df983b9fa79f0e2b20d2c6b387c180c Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Tue, 29 Jan 2013 01:34:48 +1300 Subject: altosdroid: initial release to Play Store * Add release keystore (encrypted) * Turn off debugging in UI * add 'sign' target to Makefile.am * Update version string in AndroidManifest.xml to match released version of altosui. Signed-off-by: Mike Beattie --- altosdroid/AndroidManifest.xml | 2 +- altosdroid/Makefile.am | 9 +++++++++ altosdroid/release.keystore | Bin 0 -> 1243 bytes .../src/org/altusmetrum/AltosDroid/AltosDroid.java | 4 ++-- 4 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 altosdroid/release.keystore (limited to 'altosdroid/AndroidManifest.xml') diff --git a/altosdroid/AndroidManifest.xml b/altosdroid/AndroidManifest.xml index 7147c0b1..8ecfcbb5 100644 --- a/altosdroid/AndroidManifest.xml +++ b/altosdroid/AndroidManifest.xml @@ -18,7 +18,7 @@ + android:versionName="1.1.9.3"> diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am index 3860e110..3b5abfc4 100644 --- a/altosdroid/Makefile.am +++ b/altosdroid/Makefile.am @@ -54,6 +54,15 @@ bin/AltosDroid-debug.apk: $(SRC) $(ALTOSLIB) bin/AltosDroid-release.apk: $(SRC) $(ALTOSLIB) ant release + +sign: + jarsigner -keystore release.keystore \ + -signedjar bin/AltosDroid-release-signed.apk \ + bin/AltosDroid-release-unsigned.apk AltosDroid + $(SDK)/tools/zipalign -f 4 \ + bin/AltosDroid-release-signed.apk \ + bin/AltosDroid-release.apk + endif clean: diff --git a/altosdroid/release.keystore b/altosdroid/release.keystore new file mode 100644 index 00000000..53607dcb Binary files /dev/null and b/altosdroid/release.keystore differ diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index ab1fb0de..7f98e7f6 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -119,7 +119,7 @@ public class AltosDroid extends Activity { Toast.makeText(ad.getApplicationContext(), "Connected to " + str, Toast.LENGTH_SHORT).show(); ad.mAltosVoice.speak("Connected"); //TEST! - ad.mTextView.setText(Dumper.dump(ad.mConfigData)); + //ad.mTextView.setText(Dumper.dump(ad.mConfigData)); break; case TelemetryService.STATE_CONNECTING: ad.mTitle.setText(R.string.title_connecting); @@ -135,7 +135,7 @@ public class AltosDroid extends Activity { case MSG_TELEMETRY: ad.update_ui((AltosState) msg.obj); // TEST! - ad.mTextView.setText(Dumper.dump(msg.obj)); + //ad.mTextView.setText(Dumper.dump(msg.obj)); break; } } -- cgit v1.2.3 From 5560148ffea1a718a303d999a0f8a625deceef23 Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Thu, 7 Mar 2013 18:51:27 +1300 Subject: altosdroid: minor whitespace cleanup (damn my OCD!) Signed-off-by: Mike Beattie --- altosdroid/AndroidManifest.xml | 2 -- altosdroid/res/values/strings.xml | 1 - altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | 3 --- 3 files changed, 6 deletions(-) (limited to 'altosdroid/AndroidManifest.xml') diff --git a/altosdroid/AndroidManifest.xml b/altosdroid/AndroidManifest.xml index 8ecfcbb5..62d9939b 100644 --- a/altosdroid/AndroidManifest.xml +++ b/altosdroid/AndroidManifest.xml @@ -38,9 +38,7 @@ android:theme="@android:style/Theme.Dialog" android:configChanges="orientation|keyboardHidden" /> - - diff --git a/altosdroid/res/values/strings.xml b/altosdroid/res/values/strings.xml index f00f0b55..1c86f42d 100644 --- a/altosdroid/res/values/strings.xml +++ b/altosdroid/res/values/strings.xml @@ -15,7 +15,6 @@ with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. --> - AltosDroid diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index e11a8997..5019f2fc 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -300,9 +300,6 @@ public class AltosDroid extends Activity { mAltosVoice.stop(); } - - - public void onActivityResult(int requestCode, int resultCode, Intent data) { if(D) Log.d(TAG, "onActivityResult " + resultCode); switch (requestCode) { -- cgit v1.2.3 From 10042fed36d19c1b21b8f04c57da708afc085b25 Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Thu, 7 Mar 2013 18:54:45 +1300 Subject: altosdroid: Fix up some formatting in manifest (And add flag to allow settings backup by google services) Signed-off-by: Mike Beattie --- altosdroid/AndroidManifest.xml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'altosdroid/AndroidManifest.xml') diff --git a/altosdroid/AndroidManifest.xml b/altosdroid/AndroidManifest.xml index 62d9939b..adcfe94f 100644 --- a/altosdroid/AndroidManifest.xml +++ b/altosdroid/AndroidManifest.xml @@ -16,18 +16,20 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. --> + package="org.altusmetrum.AltosDroid" + android:versionCode="1" + android:versionName="1.1.9.3"> - + android:icon="@drawable/app_icon" + android:allowBackup="true" > + -- cgit v1.2.3 From 795fba09a3ca273cd2daeeb7d9fed6bae6fa6a86 Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Thu, 7 Mar 2013 19:23:39 +1300 Subject: altosdroid: Adjust build system for GMaps & Tabs support * Use SupportV4 library for Tab support * Use Google Services Lib for Google Maps * revert to a standard Android target, not Google API's * Add permissions required for Google Maps to manifest, and API key Signed-off-by: Mike Beattie --- altosdroid/.classpath | 4 +++- altosdroid/.gitignore | 1 + altosdroid/AndroidManifest.xml | 17 +++++++++++++++++ altosdroid/Makefile.am | 37 +++++++++++++++++++++++++++---------- altosdroid/project.properties | 3 ++- 5 files changed, 50 insertions(+), 12 deletions(-) (limited to 'altosdroid/AndroidManifest.xml') diff --git a/altosdroid/.classpath b/altosdroid/.classpath index 0ca188f9..fce248e6 100644 --- a/altosdroid/.classpath +++ b/altosdroid/.classpath @@ -1,8 +1,10 @@ + - + + diff --git a/altosdroid/.gitignore b/altosdroid/.gitignore index 0d2ee6e0..56d0776d 100644 --- a/altosdroid/.gitignore +++ b/altosdroid/.gitignore @@ -2,4 +2,5 @@ local.properties bin gen libs +google-play-services_lib src/org/altusmetrum/AltosDroid/BuildInfo.java diff --git a/altosdroid/AndroidManifest.xml b/altosdroid/AndroidManifest.xml index adcfe94f..237c6dcf 100644 --- a/altosdroid/AndroidManifest.xml +++ b/altosdroid/AndroidManifest.xml @@ -20,9 +20,24 @@ android:versionCode="1" android:versionName="1.1.9.3"> + + + + + + + + + + + + + + + diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am index 9ca24531..daa64963 100644 --- a/altosdroid/Makefile.am +++ b/altosdroid/Makefile.am @@ -1,12 +1,11 @@ if ANDROID -all_target=bin/AltosDroid-debug.apk bin/AltosDroid-release.apk -clean_command=ant clean +all_target=bin/AltosDroid-debug.apk bin/AltosDroid-release-unsigned.apk else all_target= -clean_command=echo done endif SDK=$(ANDROID_SDK) +SDK_TARGET=$(shell sed -ne 's/^target=//p' project.properties) DX=$(SDK)/platform-tools/dx ADB=$(SDK)/platform-tools/adb @@ -21,6 +20,14 @@ ALTOSLIB_JAR=altoslib_$(ALTOSLIB_VERSION).jar ALTOSLIB=$(EXT_LIBDIR)/$(ALTOSLIB_JAR) +SUPPORT_V4_SRCDIR=$(SDK)/extras/android/support/v4 +SUPPORT_V4_JAR=android-support-v4.jar + +SUPPORT_V4=$(EXT_LIBDIR)/$(SUPPORT_V4_JAR) + +GOOGLE_PLAY_SERVICES_LIB_SRCDIR=$(SDK)/extras/google/google_play_services/libproject +GOOGLE_PLAY_SERVICES_LIB=google-play-services_lib + SRC=$(SRC_DIR)/*.java all: $(all_target) @@ -31,6 +38,13 @@ $(EXT_LIBDIR): $(ALTOSLIB): $(EXT_LIBDIR) $(ALTOSLIB_SRCDIR)/$(ALTOSLIB_JAR) cd $(EXT_LIBDIR) && ln -sf $(shell echo $(EXT_LIBDIR) | sed 's|[^/]\+|..|g')/$(ALTOSLIB_SRCDIR)/$(ALTOSLIB_JAR) . +$(SUPPORT_V4): $(EXT_LIBDIR) $(SUPPORT_V4_SRCDIR)/$(SUPPORT_V4_JAR) + cd $(EXT_LIBDIR) && ln -sf $(SUPPORT_V4_SRCDIR)/$(SUPPORT_V4_JAR) . + +$(GOOGLE_PLAY_SERVICES_LIB): $(GOOGLE_PLAY_SERVICES_LIB_SRCDIR)/$(GOOGLE_PLAY_SERVICES_LIB) + cp -a $(GOOGLE_PLAY_SERVICES_LIB_SRCDIR)/$(GOOGLE_PLAY_SERVICES_LIB) . + cd $(GOOGLE_PLAY_SERVICES_LIB) && $(SDK)/tools/android update project --target $(SDK_TARGET) --path . + $(SRC_DIR)/BuildInfo.java: $(SRC) ./buildinfo.sh @@ -41,10 +55,10 @@ install-release: bin/AltosDroid-release.apk install-debug: bin/AltosDroid-debug.apk $(ADB) install -r bin/AltosDroid-debug.apk -bin/AltosDroid-debug.apk: $(SRC) $(ALTOSLIB) +bin/AltosDroid-debug.apk: $(SRC) $(ALTOSLIB) $(SUPPORT_V4) $(GOOGLE_PLAY_SERVICES_LIB) ant debug -bin/AltosDroid-release.apk: $(SRC) $(ALTOSLIB) +bin/AltosDroid-release-unsigned.apk: $(SRC) $(ALTOSLIB) $(SUPPORT_V4) $(GOOGLE_PLAY_SERVICES_LIB) ant release sign: @@ -55,11 +69,14 @@ sign: bin/AltosDroid-release-signed.apk \ bin/AltosDroid-release.apk -endif +clean: $(GOOGLE_PLAY_SERVICES_LIB) + ant clean + rm -rf $(EXT_LIBDIR) + rm -rf $(GOOGLE_PLAY_SERVICES_LIB) -clean: clean-local - $(clean_command) +else -clean-local: - rm -rf $(EXT_LIBDIR) +clean: + +endif diff --git a/altosdroid/project.properties b/altosdroid/project.properties index 0a80e644..96b9551c 100644 --- a/altosdroid/project.properties +++ b/altosdroid/project.properties @@ -8,4 +8,5 @@ # project structure. # Project target. -target=Google Inc.:Google APIs:10 +target=android-10 +android.library.reference.1=google-play-services_lib/ -- cgit v1.2.3 From 1f88d345c407e409611448d0e8813ab5a6de0a0b Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Thu, 11 Apr 2013 22:16:25 -0700 Subject: altosdroid: Hook up the position listeners Signed-off-by: Keith Packard --- altosdroid/AndroidManifest.xml | 1 - .../altusmetrum/AltosDroid/TelemetryService.java | 44 +++++++++++++++++++++- 2 files changed, 43 insertions(+), 2 deletions(-) (limited to 'altosdroid/AndroidManifest.xml') diff --git a/altosdroid/AndroidManifest.xml b/altosdroid/AndroidManifest.xml index 237c6dcf..bf885744 100644 --- a/altosdroid/AndroidManifest.xml +++ b/altosdroid/AndroidManifest.xml @@ -31,7 +31,6 @@ - service; @@ -249,6 +278,14 @@ public class TelemetryService extends Service { // Start our timer - first event in 10 seconds, then every 10 seconds after that. timer.scheduleAtFixedRate(new TimerTask(){ public void run() {onTimerTick();}}, 10000L, 10000L); + // Listen for GPS and Network position updates + gpsListener = new AltosLocationListener(true); + netListener = new AltosLocationListener(false); + + LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE); + + locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 0, 0, gpsListener); + locationManager.requestLocationUpdates(LocationManager.NETWORK_PROVIDER, 0, 0, netListener); } @Override @@ -281,6 +318,11 @@ public class TelemetryService extends Service { @Override public void onDestroy() { + // Stop listening for location updates + LocationManager locationManager = (LocationManager) this.getSystemService(Context.LOCATION_SERVICE); + locationManager.removeUpdates(gpsListener); + locationManager.removeUpdates(netListener); + // Stop the bluetooth Comms threads stopAltosBluetooth(); -- cgit v1.2.3 From 6055ee0b7fb99f1b41ece8ba912bdd201ea35b1b Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Sun, 21 Apr 2013 14:52:56 +1200 Subject: altosdroid: Release v1.2, push to play store. Signed-off-by: Mike Beattie --- altosdroid/AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'altosdroid/AndroidManifest.xml') diff --git a/altosdroid/AndroidManifest.xml b/altosdroid/AndroidManifest.xml index bf885744..f4c167ac 100644 --- a/altosdroid/AndroidManifest.xml +++ b/altosdroid/AndroidManifest.xml @@ -17,8 +17,8 @@ --> + android:versionCode="2" + android:versionName="1.2"> -- cgit v1.2.3 From 27afe30176051fca816d85c1be265ac663ef851c Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Mon, 22 Apr 2013 13:50:35 +1200 Subject: altosdroid: Bump APK version, and re-upload. Didn't re-build altoslib for the previous APK! Signed-off-by: Mike Beattie --- altosdroid/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'altosdroid/AndroidManifest.xml') diff --git a/altosdroid/AndroidManifest.xml b/altosdroid/AndroidManifest.xml index f4c167ac..04a679e1 100644 --- a/altosdroid/AndroidManifest.xml +++ b/altosdroid/AndroidManifest.xml @@ -17,7 +17,7 @@ --> -- cgit v1.2.3