From a61a0cb0a3b57cfa7202017b2ff4eab03fc77d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Kochma=C5=84ski?= Date: Sun, 25 Oct 2015 22:57:25 +0100 Subject: [PATCH] android/example: minor tweaks with the build Add some menu stubs, icon, change application name, remove generated file, some indentation fix. --- examples/android/AndroidManifest.xml | 35 +++++++++--------- examples/android/project.properties | 14 ------- examples/android/res/drawable/icon.png | Bin 0 -> 8012 bytes examples/android/res/layout/menu.xml | 12 +++++- examples/android/res/values/strings.xml | 2 +- .../src/org/lisp/ecl/HelloEclActivity.java | 4 +- 6 files changed, 31 insertions(+), 36 deletions(-) delete mode 100644 examples/android/project.properties create mode 100644 examples/android/res/drawable/icon.png diff --git a/examples/android/AndroidManifest.xml b/examples/android/AndroidManifest.xml index 42a84eb3b..6597816c7 100644 --- a/examples/android/AndroidManifest.xml +++ b/examples/android/AndroidManifest.xml @@ -1,19 +1,20 @@ - - - - - - - - - - - - + package="org.lisp.ecl" + android:versionCode="1" + android:versionName="1.0"> + + + + + + + + + + + diff --git a/examples/android/project.properties b/examples/android/project.properties deleted file mode 100644 index 916037e33..000000000 --- a/examples/android/project.properties +++ /dev/null @@ -1,14 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-23 diff --git a/examples/android/res/drawable/icon.png b/examples/android/res/drawable/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..70a1df2cf8e7f0a04b6304a43867715a3672c8d2 GIT binary patch literal 8012 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 literal 0 HcmV?d00001 diff --git a/examples/android/res/layout/menu.xml b/examples/android/res/layout/menu.xml index 65b3bd681..af3c0d28f 100644 --- a/examples/android/res/layout/menu.xml +++ b/examples/android/res/layout/menu.xml @@ -4,5 +4,15 @@ Set id, icon and Title for each menu item --> + android:title="Uncompress assets" /> + + + + + + diff --git a/examples/android/res/values/strings.xml b/examples/android/res/values/strings.xml index f846038c2..a4512bde4 100644 --- a/examples/android/res/values/strings.xml +++ b/examples/android/res/values/strings.xml @@ -1,4 +1,4 @@ - HelloEclActivity + Embeddable Common-Lisp diff --git a/examples/android/src/org/lisp/ecl/HelloEclActivity.java b/examples/android/src/org/lisp/ecl/HelloEclActivity.java index efd745489..95086f47b 100644 --- a/examples/android/src/org/lisp/ecl/HelloEclActivity.java +++ b/examples/android/src/org/lisp/ecl/HelloEclActivity.java @@ -51,8 +51,6 @@ public class HelloEclActivity extends Activity } Log.w(TAG,"ECL starting."); - - ecl.start(getResourcesPath()); Log.w(TAG,"ECL Started"); @@ -111,7 +109,7 @@ public class HelloEclActivity extends Activity return true; } - /** + /** * Event Handling for Individual menu item selected * Identify single menu item by it's id * */