project update and jellybean fix (missing permission)

diff --git a/MS2Debounce/AndroidManifest.xml b/MS2Debounce/AndroidManifest.xml
index bc9081121346c1d9454cce6a83c451909ce0e49b..3087cfb7cdd0ef357f9ee45b4e406f9490f98dcd 100644 (file)
--- a/MS2Debounce/AndroidManifest.xml
+++ b/MS2Debounce/AndroidManifest.xml
@@ -3,6 +3,7 @@
       package="de.rmdir.ms2debounce"
       android:versionCode="1"
       android:versionName="1.0">
       package="de.rmdir.ms2debounce"
       android:versionCode="1"
       android:versionName="1.0">

+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

     <application android:label="@string/app_name" android:icon="@drawable/icon">
         <activity android:name="MS2Debounce"
                   android:label="@string/app_name">
     <application android:label="@string/app_name" android:icon="@drawable/icon">
         <activity android:name="MS2Debounce"
                   android:label="@string/app_name">

diff --git a/MS2Debounce/ant.properties b/MS2Debounce/ant.properties
new file mode 100644 (file)
index 0000000..e8955d8
--- /dev/null
+++ b/MS2Debounce/ant.properties
@@ -0,0 +1,19 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked into 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.
+
+key.alias=de.rmdir.key
+key.store=/home/michael/Android/devel-key/gernoth.keystore

diff --git a/MS2Debounce/build.properties b/MS2Debounce/build.properties
deleted file mode 100644 (file)
index 38f39dd..0000000
--- a/MS2Debounce/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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.
-key.store=/home/michael/Android/devel-key/gernoth.keystore
-key.alias=de.rmdir.key

diff --git a/MS2Debounce/build.xml b/MS2Debounce/build.xml
index 9d58faf0f7cf5948ac8aed40ca119332324413cd..6930913e1f8a2935ff70e8ba1f363f8e7a759dbd 100644 (file)
--- a/MS2Debounce/build.xml
+++ b/MS2Debounce/build.xml
@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="MS2Debounce" default="help">
 
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="MS2Debounce" default="help">
 

-<!-- The local.properties file is created and updated by the 'android'
-     tool.
-     It contains the path to the SDK. It should *NOT* be checked into
-     Version Control Systems. -->
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->

     <property file="local.properties" />
 
     <property file="local.properties" />
 

-    <!-- The build.properties file can be created by you and is never touched
-         by the 'android' tool. This is the place to change some of the
-         default property values used by the Ant rules.
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.

          Here are some properties you may want to change/update:
 
          source.dir
          Here are some properties you may want to change/update:
 
          source.dir


@@ -17,6 +16,9 @@
          out.dir
              The name of the output directory. Default is 'bin'.
 
          out.dir
              The name of the output directory. Default is 'bin'.
 

+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+

          Properties related to the SDK location or the project target should
          be updated using the 'android' tool with the 'update' action.
 
          Properties related to the SDK location or the project target should
          be updated using the 'android' tool with the 'update' action.
 


@@ -24,56 +26,58 @@
          application and should be checked into Version Control Systems.
 
          -->
          application and should be checked into Version Control Systems.
 
          -->

-    <property file="build.properties" />
+    <property file="ant.properties" />

 
 

-    <!-- The default.properties file is created and updated by the 'android'
+    <!-- The project.properties file is created and updated by the 'android'

          tool, as well as ADT.
          tool, as well as ADT.

-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <property file="default.properties" />
-
-
-    <!-- Required pre-setup import -->
-    <import file="${sdk.dir}/tools/ant/pre_setup.xml" />
-

 
 

-<!-- extension targets. Uncomment the ones where you want to do custom work
-     in between standard targets -->
-<!--
-    <target name="-pre-build">
-    </target>
-    <target name="-pre-compile">
-    </target>
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).

 
 

-    [This is typically used for code obfuscation.
-     Compiled code location: ${out.classes.absolute.dir}
-     If this is not done in place, override ${out.dex.input.absolute.dir}]
-    <target name="-post-compile">
-    </target>
--->
-
-    <!-- Execute the Android Setup task that will setup some properties
-         specific to the target, and import the build rules files.
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />

 
 

-         The rules file is imported from
-            <SDK>/tools/ant/
-         Depending on the project type it can be either:
-         - main_rules.xml
-         - lib_rules.xml
-         - test_rules.xml
+    <!-- Import the actual build file.

 
          To customize existing targets, there are two options:
          - Customize only one target:
              - copy/paste the target into this file, *before* the
 
          To customize existing targets, there are two options:
          - Customize only one target:
              - copy/paste the target into this file, *before* the

-               <setup> task.
+               <import> task.

              - customize it to your needs.
              - customize it to your needs.

-         - Customize the whole script.
+         - Customize the whole content of build.xml

              - copy/paste the content of the rules files (minus the top node)
              - copy/paste the content of the rules files (minus the top node)

-               into this file, *after* the <setup> task
-             - disable the import of the rules by changing the setup task
-               below to <setup import="false" />.
+               into this file, replacing the <import> task.

              - customize to your needs.
              - customize to your needs.

+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"

     -->
     -->

-    <setup />
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />

 
 </project>
 
 </project>

diff --git a/MS2Debounce/default.properties b/MS2Debounce/default.properties
deleted file mode 100644 (file)
index 420db56..0000000
--- a/MS2Debounce/default.properties
+++ /dev/null
@@ -1,11 +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 use,
-# "build.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=Google Inc.:Google APIs:8

diff --git a/MS2Debounce/proguard-project.txt b/MS2Debounce/proguard-project.txt
new file mode 100644 (file)
index 0000000..f2fe155
--- /dev/null
+++ b/MS2Debounce/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

diff --git a/MS2Debounce/project.properties b/MS2Debounce/project.properties
new file mode 100644 (file)
index 0000000..3e28487
--- /dev/null
+++ b/MS2Debounce/project.properties
@@ -0,0 +1,14 @@
+# 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=Google Inc.:Google APIs:8