From 029485aa596a61d9528e488d4a907f3fd71ee4b4 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sun, 19 Feb 2012 23:53:58 -0500 Subject: [PATCH 1/3] I feel like I've done this before ... --- HelloAndroid/AndroidManifest.xml | 15 ++++ HelloAndroid/ant.properties | 17 +++++ HelloAndroid/build.xml | 85 ++++++++++++++++++++++ HelloAndroid/local.properties | 10 +++ HelloAndroid/proguard.cfg | 40 ++++++++++ HelloAndroid/project.properties | 11 +++ HelloAndroid/res/layout/main.xml | 13 ++++ HelloAndroid/res/values/strings.xml | 4 + HelloAndroid/src/com/mbh/HelloAndroid.java | 15 ++++ 9 files changed, 210 insertions(+) create mode 100644 HelloAndroid/AndroidManifest.xml create mode 100644 HelloAndroid/ant.properties create mode 100644 HelloAndroid/build.xml create mode 100644 HelloAndroid/local.properties create mode 100644 HelloAndroid/proguard.cfg create mode 100644 HelloAndroid/project.properties create mode 100644 HelloAndroid/res/layout/main.xml create mode 100644 HelloAndroid/res/values/strings.xml create mode 100644 HelloAndroid/src/com/mbh/HelloAndroid.java diff --git a/HelloAndroid/AndroidManifest.xml b/HelloAndroid/AndroidManifest.xml new file mode 100644 index 0000000..a5f7d92 --- /dev/null +++ b/HelloAndroid/AndroidManifest.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/HelloAndroid/ant.properties b/HelloAndroid/ant.properties new file mode 100644 index 0000000..ee52d86 --- /dev/null +++ b/HelloAndroid/ant.properties @@ -0,0 +1,17 @@ +# This file is used to override default values used by the Ant build system. +# +# This file must be checked in Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + diff --git a/HelloAndroid/build.xml b/HelloAndroid/build.xml new file mode 100644 index 0000000..8e362c3 --- /dev/null +++ b/HelloAndroid/build.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HelloAndroid/local.properties b/HelloAndroid/local.properties new file mode 100644 index 0000000..e2dcd89 --- /dev/null +++ b/HelloAndroid/local.properties @@ -0,0 +1,10 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must *NOT* be checked in Version Control Systems, +# as it contains information specific to your local configuration. + +# location of the SDK. This is only used by Ant +# For customization when using a Version Control System, please read the +# header note. +sdk.dir=/home/me/opt/android-sdk-linux diff --git a/HelloAndroid/proguard.cfg b/HelloAndroid/proguard.cfg new file mode 100644 index 0000000..b1cdf17 --- /dev/null +++ b/HelloAndroid/proguard.cfg @@ -0,0 +1,40 @@ +-optimizationpasses 5 +-dontusemixedcaseclassnames +-dontskipnonpubliclibraryclasses +-dontpreverify +-verbose +-optimizations !code/simplification/arithmetic,!field/*,!class/merging/* + +-keep public class * extends android.app.Activity +-keep public class * extends android.app.Application +-keep public class * extends android.app.Service +-keep public class * extends android.content.BroadcastReceiver +-keep public class * extends android.content.ContentProvider +-keep public class * extends android.app.backup.BackupAgentHelper +-keep public class * extends android.preference.Preference +-keep public class com.android.vending.licensing.ILicensingService + +-keepclasseswithmembernames class * { + native ; +} + +-keepclasseswithmembers class * { + public (android.content.Context, android.util.AttributeSet); +} + +-keepclasseswithmembers class * { + public (android.content.Context, android.util.AttributeSet, int); +} + +-keepclassmembers class * extends android.app.Activity { + public void *(android.view.View); +} + +-keepclassmembers enum * { + public static **[] values(); + public static ** valueOf(java.lang.String); +} + +-keep class * implements android.os.Parcelable { + public static final android.os.Parcelable$Creator *; +} diff --git a/HelloAndroid/project.properties b/HelloAndroid/project.properties new file mode 100644 index 0000000..f049142 --- /dev/null +++ b/HelloAndroid/project.properties @@ -0,0 +1,11 @@ +# 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 use, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-10 diff --git a/HelloAndroid/res/layout/main.xml b/HelloAndroid/res/layout/main.xml new file mode 100644 index 0000000..15f4586 --- /dev/null +++ b/HelloAndroid/res/layout/main.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/HelloAndroid/res/values/strings.xml b/HelloAndroid/res/values/strings.xml new file mode 100644 index 0000000..7dabdc6 --- /dev/null +++ b/HelloAndroid/res/values/strings.xml @@ -0,0 +1,4 @@ + + + HelloAndroid + diff --git a/HelloAndroid/src/com/mbh/HelloAndroid.java b/HelloAndroid/src/com/mbh/HelloAndroid.java new file mode 100644 index 0000000..6bd7260 --- /dev/null +++ b/HelloAndroid/src/com/mbh/HelloAndroid.java @@ -0,0 +1,15 @@ +package com.mbh; + +import android.app.Activity; +import android.os.Bundle; + +public class HelloAndroid extends Activity +{ + /** Called when the activity is first created. */ + @Override + public void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + setContentView(R.layout.main); + } +} From 012ea36add0ff22a47f7c48e7ebe19026fb04578 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Sun, 19 Feb 2012 23:58:08 -0500 Subject: [PATCH 2/3] maybe using autoenv? --- .env | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 0000000..5dcb8b3 --- /dev/null +++ b/.env @@ -0,0 +1,2 @@ +export ANDROID_HOME="$HOME/opt/android-sdk-linux" +export PATH="$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$PATH" From 490eb04c395d82efb226c19a890e9f48e80a94f7 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 20 Feb 2012 09:15:08 -0500 Subject: [PATCH 3/3] Yup, definitely did this before... but where did I put it? --- .env | 2 +- HelloAndroid/.gitignore | 2 ++ HelloAndroid/src/com/mbh/HelloAndroid.java | 11 ++++++----- 3 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 HelloAndroid/.gitignore diff --git a/.env b/.env index 5dcb8b3..e97440c 100644 --- a/.env +++ b/.env @@ -1,2 +1,2 @@ -export ANDROID_HOME="$HOME/opt/android-sdk-linux" +export ANDROID_HOME="${ANDROID_HOME-"$HOME/opt/android-sdk-linux"}" export PATH="$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$PATH" diff --git a/HelloAndroid/.gitignore b/HelloAndroid/.gitignore new file mode 100644 index 0000000..e614fbb --- /dev/null +++ b/HelloAndroid/.gitignore @@ -0,0 +1,2 @@ +bin +gen diff --git a/HelloAndroid/src/com/mbh/HelloAndroid.java b/HelloAndroid/src/com/mbh/HelloAndroid.java index 6bd7260..c19432c 100644 --- a/HelloAndroid/src/com/mbh/HelloAndroid.java +++ b/HelloAndroid/src/com/mbh/HelloAndroid.java @@ -2,14 +2,15 @@ package com.mbh; import android.app.Activity; import android.os.Bundle; +import android.widget.TextView; -public class HelloAndroid extends Activity -{ +public class HelloAndroid extends Activity { /** Called when the activity is first created. */ @Override - public void onCreate(Bundle savedInstanceState) - { + public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.main); + TextView tv = new TextView(this); + tv.setText("Hello, Android"); + setContentView(tv); } }