diff options
| author | Keith Packard <keithp@keithp.com> | 2013-02-10 01:21:52 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-02-10 01:21:52 -0800 |
| commit | bf88c5f829ea5d32043431945e862a9f6c96740a (patch) | |
| tree | 6ab88a057b3f69f16b8d048ae132bcbe31812dfe | |
| parent | 32270296671aac3b3ba15f9c1777bcdd77b9c36c (diff) | |
| parent | d05a77992df983b9fa79f0e2b20d2c6b387c180c (diff) | |
Merge remote-tracking branch 'mjb/master'
| -rw-r--r-- | altosdroid/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | altosdroid/Makefile.am | 9 | ||||
| -rw-r--r-- | altosdroid/release.keystore | bin | 0 -> 1243 bytes | |||
| -rw-r--r-- | altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java | 4 |
4 files changed, 12 insertions, 3 deletions
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 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.altusmetrum.AltosDroid" android:versionCode="1" - android:versionName="1.0"> + android:versionName="1.1.9.3"> <uses-sdk android:targetSdkVersion="10" android:minSdkVersion="10"/> <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> <uses-permission android:name="android.permission.BLUETOOTH" /> diff --git a/altosdroid/Makefile.am b/altosdroid/Makefile.am index cc74b7a8..39f3c2b6 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: clean-local diff --git a/altosdroid/release.keystore b/altosdroid/release.keystore Binary files differnew file mode 100644 index 00000000..53607dcb --- /dev/null +++ b/altosdroid/release.keystore diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index fe4907dd..caa1a1c5 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; } } |