From c7652d075dacb23c6a4ee5f3efd1cf4410921fbb Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <Sylvain.Berfini@Belledonne-Communications.com>
Date: Tue, 3 Jul 2012 14:03:26 +0200
Subject: [PATCH] Dialer icons renamed

---
 build.xml                             | 1082 ++++++++++++++-----------
 res/drawable/numpad_eight.xml         |    2 +-
 res/drawable/numpad_eight_default.png |  Bin 0 -> 6016 bytes
 res/drawable/numpad_five.xml          |    2 +-
 res/drawable/numpad_five_default.png  |  Bin 0 -> 4853 bytes
 res/drawable/numpad_four.xml          |    2 +-
 res/drawable/numpad_four_default.png  |  Bin 0 -> 4844 bytes
 res/drawable/numpad_nine.xml          |    2 +-
 res/drawable/numpad_nine_default.png  |  Bin 0 -> 5808 bytes
 res/drawable/numpad_one.xml           |    2 +-
 res/drawable/numpad_one_default.png   |  Bin 0 -> 3432 bytes
 res/drawable/numpad_seven.xml         |    2 +-
 res/drawable/numpad_seven_default.png |  Bin 0 -> 4278 bytes
 res/drawable/numpad_sharp.xml         |    2 +-
 res/drawable/numpad_sharp_default.png |  Bin 0 -> 5204 bytes
 res/drawable/numpad_six.xml           |    2 +-
 res/drawable/numpad_six_default.png   |  Bin 0 -> 5843 bytes
 res/drawable/numpad_star.xml          |    2 +-
 res/drawable/numpad_star_default.png  |  Bin 0 -> 4479 bytes
 res/drawable/numpad_three.xml         |    2 +-
 res/drawable/numpad_three_default.png |  Bin 0 -> 5111 bytes
 res/drawable/numpad_two.xml           |    2 +-
 res/drawable/numpad_two_default.png   |  Bin 0 -> 4790 bytes
 res/drawable/numpad_zero.xml          |    2 +-
 res/drawable/numpad_zero_default.png  |  Bin 0 -> 5173 bytes
 25 files changed, 641 insertions(+), 465 deletions(-)
 create mode 100644 res/drawable/numpad_eight_default.png
 create mode 100644 res/drawable/numpad_five_default.png
 create mode 100644 res/drawable/numpad_four_default.png
 create mode 100644 res/drawable/numpad_nine_default.png
 create mode 100644 res/drawable/numpad_one_default.png
 create mode 100644 res/drawable/numpad_seven_default.png
 create mode 100644 res/drawable/numpad_sharp_default.png
 create mode 100644 res/drawable/numpad_six_default.png
 create mode 100644 res/drawable/numpad_star_default.png
 create mode 100644 res/drawable/numpad_three_default.png
 create mode 100644 res/drawable/numpad_two_default.png
 create mode 100644 res/drawable/numpad_zero_default.png

diff --git a/build.xml b/build.xml
index 5d36bb5e7..bdf3f15bc 100644
--- a/build.xml
+++ b/build.xml
@@ -1,92 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="Linphone" default="debug">
 
-    <!-- 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. -->
-    <loadproperties srcFile="local.properties" />
-
-    <!-- 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
-             The name of the source directory. Default is 'src'.
-         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.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         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 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'"
-            unless="sdk.dir"
-    />
-
-
-<!-- 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 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>
--->
-
-    <!-- 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
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - 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"
-    -->
-    <!-- version-tag: custom -->
     <!--
         This build file is imported by the project build file. It contains
         all the targets and tasks necessary to build Android projects, be they
         regular projects, library projects, or test projects.
 
         At the beginning of the file is a list of properties that can be overridden
-        by adding them to your build.properties (properties are immutable, so their
+        by adding them to your ant.properties (properties are immutable, so their
         first definition sticks and is never changed).
 
         Follows:
@@ -102,16 +23,23 @@
         - help target
     -->
 
-    <property name="linphone.package.name" value="org.linphone" />
+    <!-- ******************************************************* -->
+    <!-- **************** Overridable Properties *************** -->
+    <!-- ******************************************************* -->
 
-    <!-- ********** Overrideable Properties ********** -->
-
-    <!-- You can override these values in your build.xml or build.properties.
+    <!-- You can override these values in your build.xml or ant.properties.
          Overriding any other properties may result in broken build. -->
 
     <!-- Tells adb which device to target. You can change this from the command line
          by invoking "ant -Dadb.device.arg=-d" for device "ant -Dadb.device.arg=-e" for
          the emulator. -->
+         
+    <loadproperties srcFile="local.properties" />
+    <property file="ant.properties" />
+    <loadproperties srcFile="project.properties" />
+    <!-- version-tag: custom -->
+    <property name="linphone.package.name" value="org.linphone" />
+    
     <property name="adb.device.arg" value="" />
 
     <!-- fileset exclude patterns (space separated) to prevent
@@ -124,16 +52,41 @@
     <property name="version.code" value="" />
     <property name="version.name" value="" />
     <property name="aapt.resource.filter" value="" />
+    <!-- 'aapt.ignore.assets' is the list of file patterns to ignore under /res and /assets.
+         Default is "!.svn:!.git:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*.scc:*~"
+
+         Overall patterns syntax is:
+           [!][<dir>|<file>][*suffix-match|prefix-match*|full-match]:more:patterns...
+
+         - The first character flag ! avoids printing a warning.
+         - Pattern can have the flag "<dir>" to match only directories
+           or "<file>" to match only files. Default is to match both.
+         - Match is not case-sensitive.
+    -->
+    <property name="aapt.ignore.assets" value="" />
 
     <!-- compilation options -->
     <property name="java.encoding" value="UTF-8" />
     <property name="java.target" value="1.5" />
     <property name="java.source" value="1.5" />
+    <property name="java.compilerargs" value="" />
+
+    <!-- Renderscript options -->
+    <property name="renderscript.debug.opt.level" value="O0" />
+    <property name="renderscript.release.opt.level" value="O3" />
+
+    <!-- manifest merger default value -->
+    <property name="manifestmerger.enabled" value="false" />
+
+    <!-- instrumentation options -->
+    <property name="emma.filter" value="" />
 
     <!-- Verbosity -->
-    <property name="verbose" value="true" />
+    <property name="verbose" value="false" />
 
-    <!-- ********** Custom Tasks ********** -->
+    <!-- ******************************************************* -->
+    <!-- ********************* Custom Tasks ******************** -->
+    <!-- ******************************************************* -->
 
     <!-- jar file from where the tasks are loaded -->
     <path id="android.antlibs">
@@ -141,41 +94,7 @@
     </path>
 
     <!-- Custom tasks -->
-    <taskdef name="setup"
-            classname="com.android.ant.NewSetupTask"
-            classpathref="android.antlibs" />
-
-    <taskdef name="aapt"
-            classname="com.android.ant.AaptExecTask"
-            classpathref="android.antlibs" />
-
-    <taskdef name="aidl"
-            classname="com.android.ant.AidlExecTask"
-            classpathref="android.antlibs" />
-
-    <taskdef name="renderscript"
-            classname="com.android.ant.RenderScriptTask"
-            classpathref="android.antlibs" />
-
-    <taskdef name="dex"
-            classname="com.android.ant.DexExecTask"
-            classpathref="android.antlibs" />
-
-    <taskdef name="apkbuilder"
-            classname="com.android.ant.ApkBuilderTask"
-            classpathref="android.antlibs" />
-
-    <taskdef name="zipalign"
-            classname="com.android.ant.ZipAlignTask"
-            classpathref="android.antlibs" />
-
-    <taskdef name="xpath"
-            classname="com.android.ant.XPathTask"
-            classpathref="android.antlibs" />
-
-    <taskdef name="if"
-            classname="com.android.ant.IfElseTask"
-            classpathref="android.antlibs" />
+    <taskdef resource="anttasks.properties" classpathref="android.antlibs" />
 
     <!-- Emma configuration -->
     <property name="emma.dir" value="${sdk.dir}/tools/lib" />
@@ -187,7 +106,9 @@
     <!-- End of emma configuration -->
 
 
-    <!-- ********** Other Properties ********** -->
+    <!-- ******************************************************* -->
+    <!-- ******************* Other Properties ****************** -->
+    <!-- ******************************************************* -->
     <!-- overriding these properties may break the build
          unless the whole file is updated -->
 
@@ -196,16 +117,22 @@
     <property name="source.absolute.dir" location="${source.dir}" />
     <property name="gen.absolute.dir" location="gen" />
     <property name="resource.absolute.dir" location="res" />
-    <property name="asset.absolute.dir" location="assets" />
+    <property name="asset.dir" value="assets" />
+    <property name="asset.absolute.dir" location="${asset.dir}" />
     <property name="jar.libs.dir" value="libs" />
     <property name="jar.libs.absolute.dir" location="${jar.libs.dir}" />
     <property name="native.libs.absolute.dir" location="libs" />
 
+    <property name="manifest.file" value="AndroidManifest.xml" />
+    <property name="manifest.abs.file" location="${manifest.file}" />
+
     <!-- Output directories -->
     <property name="out.dir" value="bin" />
     <property name="out.absolute.dir" location="${out.dir}" />
     <property name="out.classes.absolute.dir" location="${out.dir}/classes" />
     <property name="out.res.absolute.dir" location="${out.dir}/res" />
+    <property name="out.aidl.absolute.dir" location="${out.dir}/aidl" />
+    <property name="out.manifest.abs.file" location="${out.dir}/AndroidManifest.xml" />
 
     <!-- tools location -->
     <property name="android.tools.dir" location="${sdk.dir}/tools" />
@@ -217,8 +144,13 @@
     <property name="aidl" location="${android.platform.tools.dir}/aidl${exe}" />
     <property name="aapt" location="${android.platform.tools.dir}/aapt${exe}" />
     <property name="dx" location="${android.platform.tools.dir}/dx${bat}" />
-    <!-- renderscript location is set by NewSetupTask since we have a choice of
-         several executables based on minSdkVersion -->
+    <property name="renderscript" location="${android.platform.tools.dir}/llvm-rs-cc${exe}"/>
+
+    <!-- Renderscript include Path -->
+    <path id="android.renderscript.include.path">
+        <pathelement location="${android.platform.tools.dir}/renderscript/include" />
+        <pathelement location="${android.platform.tools.dir}/renderscript/clang-include" />
+    </path>
 
     <!-- Intermediate files -->
     <property name="dex.file.name" value="classes.dex" />
@@ -255,7 +187,20 @@
     <!-- properties for packaging -->
     <property name="build.packaging.nocrunch" value="true" />
 
-    <!-- ********** Macros ********** -->
+    <!-- whether we need to fork javac.
+         This is only needed on Windows when running Java < 7 -->
+    <condition else="false" property="need.javac.fork">
+        <and>
+            <matches pattern="1\.[56]" string="${java.specification.version}"/>
+            <not>
+                <os family="unix"/>
+            </not>
+        </and>
+    </condition>
+
+    <!-- ******************************************************* -->
+    <!-- ************************ Macros *********************** -->
+    <!-- ******************************************************* -->
 
     <!-- macro to do a task on if project.is.library is false.
          elseText attribute is displayed otherwise -->
@@ -268,7 +213,7 @@
                 <task-to-do />
             </else>
             <then>
-                <echo>@{elseText}</echo>
+                <echo level="info">@{elseText}</echo>
             </then>
         </if>
         </sequential>
@@ -290,7 +235,7 @@
                         <length string="@{elseText}" trim="true" when="greater" length="0" />
                     </condition>
                     <then>
-                        <echo>@{elseText}</echo>
+                        <echo level="info">@{elseText}</echo>
                     </then>
                 </if>
             </else>
@@ -317,7 +262,7 @@
                 </condition>
                 <else>
                     <path id="out.dex.jar.input.ref">
-                        <path refid="jar.libs.ref" />
+                        <path refid="project.all.jars.path" />
                     </path>
                 </else>
             </if>
@@ -325,9 +270,7 @@
             <dex executable="${dx}"
                     output="${intermediate.dex.file}"
                     nolocals="@{nolocals}"
-                    verbose="${verbose}"
-                    previousBuildType="${build.last.target}"
-                    buildType="${build.target}">
+                    verbose="${verbose}">
                 <path path="${out.dex.input.absolute.dir}"/>
                 <path refid="out.dex.jar.input.ref" />
                 <external-libs />
@@ -359,9 +302,9 @@
                     buildType="${build.is.packaging.debug}/${build.is.signing.debug}">
                 <dex path="${intermediate.dex.file}"/>
                 <sourcefolder path="${source.absolute.dir}"/>
-                <jarfile refid="jar.libs.ref" />
+                <jarfile refid="project.all.jars.path" />
                 <nativefolder path="${native.libs.absolute.dir}" />
-                <nativefolder refid="project.libraries.libs" />
+                <nativefolder refid="project.library.native.folder.path" />
                 <extra-jars/>
             </apkbuilder>
         </sequential>
@@ -385,7 +328,7 @@
         <attribute name="emma.enabled" default="false" />
         <element name="extra-instrument-args" optional="yes" />
         <sequential>
-            <echo>Running tests ...</echo>
+            <echo level="info">Running tests ...</echo>
             <exec executable="${adb}" failonerror="true">
                 <arg line="${adb.device.arg}" />
                 <arg value="shell" />
@@ -396,7 +339,7 @@
                 <arg value="coverage" />
                 <arg value="@{emma.enabled}" />
                 <extra-instrument-args />
-                <arg value="${manifest.package}/${test.runner}" />
+                <arg value="${project.app.package}/${test.runner}" />
             </exec>
         </sequential>
     </macrodef>
@@ -423,7 +366,7 @@
     <macrodef name="uninstall-helper">
         <attribute name="app.package" default="false" />
         <sequential>
-            <echo>Uninstalling @{app.package} from the default emulator or device...</echo>
+            <echo level="info">Uninstalling @{app.package} from the default emulator or device...</echo>
             <exec executable="${adb}" failonerror="true">
                 <arg line="${adb.device.arg}" />
                 <arg value="uninstall" />
@@ -432,88 +375,126 @@
         </sequential>
     </macrodef>
 
-    <!-- ********** Build Targets ********** -->
+    <!-- ******************************************************* -->
+    <!-- ******************** Build Targets ******************** -->
+    <!-- ******************************************************* -->
 
-    <!-- this target simply force running -setup making
-         the project info be read. To be used as
-             ant all clean
-         to clean the main project as well as the libraries and tested project -->
-    <target name="all" depends="-setup"/>
+    <!-- Basic Ant + SDK check -->
+    <target name="-check-env">
+        <checkenv />
+    </target>
+
+    <!-- target to disable building dependencies -->
+    <target name="nodeps">
+        <property name="dont.do.deps" value="true" />
+    </target>
+
+    <!-- generic setup -->
+    <target name="-setup" depends="-check-env">
+        <echo level="info">Project Name: ${ant.project.name}</echo>
+        <gettype projectTypeOut="project.type" />
+
+        <!-- sets a few boolean based on project.type
+             to make the if task easier -->
+        <condition property="project.is.library" value="true" else="false">
+            <equals arg1="${project.type}" arg2="library" />
+        </condition>
+        <condition property="project.is.test" value="true" else="false">
+            <equals arg1="${project.type}" arg2="test" />
+        </condition>
+        <condition property="project.is.testapp" value="true" else="false">
+            <equals arg1="${project.type}" arg2="test-app" />
+        </condition>
+
+        <!-- If a test project, resolve absolute path to tested project. -->
+        <if condition="${project.is.test}">
+            <then>
+                <property name="tested.project.absolute.dir" location="${tested.project.dir}" />
+            </then>
+        </if>
+
+        <!-- If the "debug" build type changed, clear out the compiled code.
+             This is to make sure the new BuildConfig.DEBUG value is picked up
+             as javac can't deal with this type of change in its dependency computation. -->
+        <if>
+            <condition>
+                <and>
+                    <length string="${build.last.is.packaging.debug}" trim="true" when="greater" length="0" />
+                    <not><equals
+                            arg1="${build.is.packaging.debug}"
+                            arg2="${build.last.is.packaging.debug}" /></not>
+                </and>
+            </condition>
+            <then>
+                <echo level="info">Switching between debug and non debug build: Deleting previous compilation output...</echo>
+                <delete dir="${out.classes.absolute.dir}" verbose="${verbose}" />
+            </then>
+            <else>
+                <!-- Else, we may still need to clean the code, for another reason.
+                     special case for instrumented: if the previous build was
+                     instrumented but not this one, clear out the compiled code -->
+                <if>
+                    <condition>
+                        <and>
+                            <istrue value="${build.last.is.instrumented}" />
+                            <isfalse value="${build.is.instrumented}" />
+                        </and>
+                    </condition>
+                    <then>
+                        <echo level="info">Switching from instrumented to non-instrumented build: Deleting previous compilation output...</echo>
+                        <delete dir="${out.classes.absolute.dir}" verbose="${verbose}" />
+                    </then>
+                </if>
+            </else>
+        </if>
+
+
+        <!-- get the project manifest package -->
+        <xpath input="${manifest.abs.file}"
+                expression="/manifest/@package" output="project.app.package" />
+
+    </target>
+
+    <!-- empty default pre-clean target. Create a similar target in
+         your build.xml and it'll be called instead of this one. -->
+    <target name="-pre-clean"/>
 
     <!-- clean target -->
-    <target name="clean" description="Removes output files created by other targets.">
+    <target name="clean" depends="-setup, -pre-clean"
+            description="Removes output files created by other targets.">
         <delete dir="${out.absolute.dir}" verbose="${verbose}" />
         <delete dir="${gen.absolute.dir}" verbose="${verbose}" />
 
-        <!-- if we know about a tested project or libraries, we clean them too. This
-             will only work if the target 'all' was called first -->
+        <!-- if we know about a tested project or libraries, we clean them too. -->
         <if condition="${project.is.test}">
             <then>
                 <property name="tested.project.absolute.dir" location="${tested.project.dir}" />
                 <subant failonerror="true">
                     <fileset dir="${tested.project.absolute.dir}" includes="build.xml" />
-                    <target name="all" />
                     <target name="clean" />
                 </subant>
             </then>
         </if>
 
+        <!-- get all the libraries -->
         <if>
-            <condition>
-                <isreference refid="project.libraries" />
-            </condition>
+            <condition><not><isset property="dont.do.deps" /></not></condition>
             <then>
-                <subant
-                        buildpathref="project.libraries"
-                        antfile="build.xml"
-                        failonerror="true">
-                    <target name="all" />
-                    <target name="clean" />
-                </subant>
-            </then>
-        </if>
-    </target>
-
-    <!-- generic setup -->
-    <target name="-setup">
-        <if>
-            <condition>
-                <not><isset property="setup.done" /></not>
-            </condition>
-            <then>
-                <property name="setup.done" value="true" />
-                <echo>Gathering info for ${ant.project.name}...</echo>
-                <!-- load project properties, resolve Android target, library dependencies
-                     and set some properties with the results.
-                     All property names are passed as parameters ending in -Out -->
-                <setup
-                        projectTypeOut="android.project.type"
-                        androidJarFileOut="android.jar"
-                        androidAidlFileOut="android.aidl"
-                        renderScriptExeOut="renderscript"
-                        renderScriptIncludeDirOut="android.rs"
-                        bootclasspathrefOut="android.target.classpath"
-                        projectLibrariesRootOut="project.libraries"
-                        projectLibrariesJarsOut="project.libraries.jars"
-                        projectLibrariesResOut="project.libraries.res"
-                        projectLibrariesPackageOut="project.libraries.package"
-                        projectLibrariesLibsOut="project.libraries.libs"
-                        targetApiOut="target.api"
-                />
-
-                <!-- sets a few boolean based on android.project.type
-                     to make the if task easier -->
-                <condition property="project.is.library" else="false">
-                    <equals arg1="${android.project.type}" arg2="library" />
-                </condition>
-                <condition property="project.is.test" else="false">
-                    <equals arg1="${android.project.type}" arg2="test" />
-                </condition>
-
-                <!-- If a test project, resolve absolute path to tested project. -->
-                <if condition="${project.is.test}">
+                <getlibpath libraryFolderPathOut="project.library.folder.path" />
+                <if>
+                    <condition>
+                        <isreference refid="project.library.folder.path" />
+                    </condition>
                     <then>
-                        <property name="tested.project.absolute.dir" location="${tested.project.dir}" />
+                        <!-- clean the libraries with nodeps since we already
+                             know about all the libraries even the indirect one -->
+                        <subant
+                                buildpathref="project.library.folder.path"
+                                antfile="build.xml"
+                                failonerror="true">
+                            <target name="nodeps" />
+                            <target name="clean" />
+                        </subant>
                     </then>
                 </if>
             </then>
@@ -525,30 +506,79 @@
 
         <!-- read the previous build mode -->
         <property file="${out.build.prop.file}" />
-        <!-- if empty the prop won't be set, so set it to the current target
-             to provide a default value equal to the current build -->
-        <property name="build.last.target" value="${build.target}" />
-        <!-- also set the default value for whether the build is instrumented -->
-        <property name="build.last.is.instrumented" value="${build.is.instrumented}" />
-        <property name="build.last.is.packaging.debug" value="${build.is.packaging.debug}" />
-        <property name="build.last.is.signing.debug" value="${build.is.signing.debug}" />
+        <!-- if empty the props won't be set, meaning it's a new build.
+             To force a build, set the prop to empty values. -->
+        <property name="build.last.target" value="" />
+        <property name="build.last.is.instrumented" value="" />
+        <property name="build.last.is.packaging.debug" value="" />
+        <property name="build.last.is.signing.debug" value="" />
+
+        <echo level="info">Resolving Build Target for ${ant.project.name}...</echo>
+        <!-- load project properties, resolve Android target, library dependencies
+             and set some properties with the results.
+             All property names are passed as parameters ending in -Out -->
+        <gettarget
+                androidJarFileOut="project.target.android.jar"
+                androidAidlFileOut="project.target.framework.aidl"
+                bootClassPathOut="project.target.class.path"
+                targetApiOut="project.target.apilevel"
+                minSdkVersionOut="project.minSdkVersion" />
+
+        <!-- Value of the hasCode attribute (Application node) extracted from manifest file -->
+        <xpath input="${manifest.abs.file}" expression="/manifest/application/@android:hasCode"
+                    output="manifest.hasCode" default="true"/>
+
+        <echo level="info">----------</echo>
+        <echo level="info">Creating output directories if needed...</echo>
+        <mkdir dir="${resource.absolute.dir}" />
+        <mkdir dir="${jar.libs.absolute.dir}" />
+        <mkdir dir="${out.absolute.dir}" />
+        <mkdir dir="${out.res.absolute.dir}" />
+        <do-only-if-manifest-hasCode>
+            <mkdir dir="${gen.absolute.dir}" />
+            <mkdir dir="${out.classes.absolute.dir}" />
+        </do-only-if-manifest-hasCode>
+
+        <echo level="info">----------</echo>
+        <echo level="info">Resolving Dependencies for ${ant.project.name}...</echo>
+        <dependency
+                libraryFolderPathOut="project.library.folder.path"
+                libraryPackagesOut="project.library.packages"
+                libraryManifestFilePathOut="project.library.manifest.file.path"
+                libraryResFolderPathOut="project.library.res.folder.path"
+                libraryBinAidlFolderPathOut="project.library.bin.aidl.folder.path"
+                libraryNativeFolderPathOut="project.library.native.folder.path"
+                jarLibraryPathOut="project.all.jars.path"
+                targetApi="${project.target.apilevel}"
+                verbose="${verbose}" />
 
         <!-- compile the libraries if any -->
         <if>
             <condition>
-                <isreference refid="project.libraries" />
+                <and>
+                    <isreference refid="project.library.folder.path" />
+                    <not><isset property="dont.do.deps" /></not>
+                </and>
             </condition>
             <then>
-                <echo>Building Libraries</echo>
-                <subant
-                        buildpathref="project.libraries"
-                        antfile="build.xml"
-                        target="${build.target}"
-                        failonerror="true"/>
-                <echo></echo>
-                <echo>############################################</echo>
-                <echo>**** Back to project ${ant.project.name} ****</echo>
-                <echo>############################################</echo>
+                <!-- figure out which target must be used to build the library projects.
+                     If emma is enabled, then use 'instrument' otherwise, use 'debug' -->
+                <condition property="project.libraries.target" value="instrument" else="${build.target}">
+                    <istrue value="${build.is.instrumented}" />
+                </condition>
+
+                <echo level="info">----------</echo>
+                <echo level="info">Building Libraries with '${project.libraries.target}'...</echo>
+
+                <!-- no need to build the deps as we have already
+                     the full list of libraries -->
+                <subant failonerror="true"
+                        buildpathref="project.library.folder.path"
+                        antfile="build.xml">
+                    <target name="nodeps" />
+                    <target name="${project.libraries.target}" />
+                    <property name="emma.coverage.absolute.file" location="${out.absolute.dir}/coverage.em" />
+                </subant>
             </then>
         </if>
 
@@ -561,53 +591,24 @@
                     <isset property="emma.enabled" />
                 </condition>
 
-                <echo>Building tested project at ${tested.project.absolute.dir}</echo>
+                <echo level="info">----------</echo>
+                <echo level="info">Building tested project at ${tested.project.absolute.dir} with '${tested.project.target}'...</echo>
                 <subant target="${tested.project.target}" failonerror="true">
                     <fileset dir="${tested.project.absolute.dir}" includes="build.xml" />
                 </subant>
-                <echo></echo>
-                <echo>############################################</echo>
-                <echo>**** Back to project ${ant.project.name} ****</echo>
-                <echo>############################################</echo>
+
+                <!-- get the tested project full classpath to be able to build
+                     the test project -->
+                <testedprojectclasspath
+                        projectLocation="${tested.project.absolute.dir}"
+                        projectClassPathOut="tested.project.classpath"/>
             </then>
+            <else>
+                <!-- no tested project, make an empty Path object so that javac doesn't
+                     complain -->
+                <path id="tested.project.classpath" />
+            </else>
         </if>
-
-        <!-- Value of the hasCode attribute (Application node) extracted from manifest file -->
-        <xpath input="AndroidManifest.xml" expression="/manifest/application/@android:hasCode"
-                    output="manifest.hasCode" default="true"/>
-
-        <!-- create a path with all the jar files, from the main project and the
-             libraries -->
-        <path id="jar.libs.ref">
-            <fileset dir="${jar.libs.absolute.dir}" includes="*.jar" />
-            <path refid="project.libraries.jars" />
-        </path>
-
-        <!-- special case for instrumented: if the previous build was
-             instrumented but not this one, clear out the compiled code -->
-        <if>
-            <condition>
-                <and>
-                    <istrue value="${build.last.is.instrumented}" />
-                    <isfalse value="${build.is.instrumented}" />
-                </and>
-            </condition>
-            <then>
-                <echo>Switching from instrumented to non-instrumented build.</echo>
-                <echo>Deleting previous compilation output:</echo>
-                <delete dir="${out.classes.absolute.dir}" verbose="${verbose}" />
-            </then>
-        </if>
-
-        <echo>Creating output directories if needed...</echo>
-        <mkdir dir="${resource.absolute.dir}" />
-        <mkdir dir="${jar.libs.absolute.dir}" />
-        <mkdir dir="${out.absolute.dir}" />
-        <mkdir dir="${out.res.absolute.dir}" />
-        <do-only-if-manifest-hasCode>
-            <mkdir dir="${gen.absolute.dir}" />
-            <mkdir dir="${out.classes.absolute.dir}" />
-        </do-only-if-manifest-hasCode>
     </target>
 
     <!-- empty default pre-build target. Create a similar target in
@@ -616,40 +617,64 @@
 
     <!-- Code Generation: compile resources (aapt -> R.java), aidl, renderscript -->
     <target name="-code-gen">
+        <!-- always merge manifest -->
+        <mergemanifest
+                appManifest="${manifest.abs.file}"
+                outManifest="${out.manifest.abs.file}"
+                enabled="${manifestmerger.enabled}">
+            <library refid="project.library.manifest.file.path" />
+        </mergemanifest>
+
         <do-only-if-manifest-hasCode
                 elseText="hasCode = false. Skipping aidl/renderscript/R.java">
-            <echo>----------</echo>
-            <echo>Handling aidl files...</echo>
-            <aidl executable="${aidl}" framework="${android.aidl}"
-                    genFolder="${gen.absolute.dir}">
+            <echo level="info">Handling aidl files...</echo>
+            <aidl executable="${aidl}"
+                    framework="${project.target.framework.aidl}"
+                    libraryBinAidlFolderPathRefid="project.library.bin.aidl.folder.path"
+                    genFolder="${gen.absolute.dir}"
+                    aidlOutFolder="${out.aidl.absolute.dir}">
                 <source path="${source.absolute.dir}"/>
             </aidl>
 
             <!-- renderscript generates resources so it must be called before aapt -->
-            <echo>----------</echo>
-            <echo>Handling RenderScript files...</echo>
+            <echo level="info">----------</echo>
+            <echo level="info">Handling RenderScript files...</echo>
             <renderscript executable="${renderscript}"
-                    framework="${android.rs}"
+                    includePath="${android.renderscript.include.path}"
                     genFolder="${gen.absolute.dir}"
-                    resFolder="${resource.absolute.dir}/raw"
-                    targetApi="${target.api}">
+                    resFolder="${out.res.absolute.dir}/raw"
+                    targetApi="${project.minSdkVersion}"
+                    optLevel="${renderscript.opt.level}"
+                    buildType="${build.is.packaging.debug}"
+                    previousBuildType="${build.last.is.packaging.debug}">
                 <source path="${source.absolute.dir}"/>
             </renderscript>
 
-            <echo>----------</echo>
-            <echo>Handling Resources...</echo>
+            <echo level="info">----------</echo>
+            <echo level="info">Handling Resources...</echo>
             <aapt executable="${aapt}"
                     command="package"
                     verbose="${verbose}"
-                    manifest="AndroidManifest.xml"
-                    androidjar="${android.jar}"
+                    manifest="${out.manifest.abs.file}"
+                    androidjar="${project.target.android.jar}"
                     rfolder="${gen.absolute.dir}"
                     nonConstantId="${android.library}"
-                    projectLibrariesResName="project.libraries.res"
-                    projectLibrariesPackageName="project.libraries.package">
+                    libraryResFolderPathRefid="project.library.res.folder.path"
+                    libraryPackagesRefid="project.library.packages"
+                    ignoreAssets="${aapt.ignore.assets}"
+                    proguardFile="${out.absolute.dir}/proguard.txt">
                 <res path="${out.res.absolute.dir}" />
                 <res path="${resource.absolute.dir}" />
             </aapt>
+
+            <echo level="info">----------</echo>
+            <echo level="info">Handling BuildConfig class...</echo>
+            <buildconfig
+                    genFolder="${gen.absolute.dir}"
+                    package="${project.app.package}"
+                    buildType="${build.is.packaging.debug}"
+                    previousBuildType="${build.last.is.packaging.debug}"/>
+
         </do-only-if-manifest-hasCode>
     </target>
 
@@ -660,68 +685,78 @@
     <!-- Compiles this project's .java files into .class files. -->
     <target name="-compile" depends="-build-setup, -pre-build, -code-gen, -pre-compile">
         <do-only-if-manifest-hasCode elseText="hasCode = false. Skipping...">
-            <!-- If android rules are used for a test project, its classpath should include
-                 tested project's location -->
-            <condition property="extensible.classpath"
-                    value="${tested.project.absolute.dir}/bin/classes"
-                    else=".">
-                <isset property="tested.project.absolute.dir" />
-            </condition>
-            <condition property="extensible.libs.classpath"
-                    value="${tested.project.absolute.dir}/${jar.libs.dir}"
-                    else="${jar.libs.dir}">
-                <isset property="tested.project.absolute.dir" />
-            </condition>
+            <!-- merge the project's own classpath and the tested project's classpath -->
+            <path id="project.javac.classpath">
+                <path refid="project.all.jars.path" />
+                <path refid="tested.project.classpath" />
+            </path>
             <javac encoding="${java.encoding}"
                     source="${java.source}" target="${java.target}"
-                    debug="true" extdirs=""
+                    debug="true" extdirs="" includeantruntime="false"
                     destdir="${out.classes.absolute.dir}"
-                    bootclasspathref="android.target.classpath"
+                    bootclasspathref="project.target.class.path"
                     verbose="${verbose}"
-                    classpath="${extensible.classpath}"
-                    classpathref="jar.libs.ref">
+                    classpathref="project.javac.classpath"
+                    fork="${need.javac.fork}">
                 <src path="${source.absolute.dir}" />
                 <src path="${gen.absolute.dir}" />
-                <classpath>
-                    <fileset dir="${extensible.libs.classpath}" includes="*.jar" />
-                </classpath>
+                <compilerarg line="${java.compilerargs}" />
             </javac>
+
+            <!-- if the project is instrumented, intrument the classes -->
+            <if condition="${build.is.instrumented}">
+                <then>
+                    <echo level="info">Instrumenting classes from ${out.absolute.dir}/classes...</echo>
+
+                    <!-- build the filter to remove R, Manifest, BuildConfig -->
+                    <getemmafilter
+                            appPackage="${project.app.package}"
+                            libraryPackagesRefId="project.library.packages"
+                            filterOut="emma.default.filter"/>
+
+                    <!-- define where the .em file is going. This may have been
+                         setup already if this is a library -->
+                    <property name="emma.coverage.absolute.file" location="${out.absolute.dir}/coverage.em" />
+
+                    <!-- It only instruments class files, not any external libs -->
+                    <emma enabled="true">
+                        <instr verbosity="${verbosity}"
+                               mode="overwrite"
+                               instrpath="${out.absolute.dir}/classes"
+                               outdir="${out.absolute.dir}/classes"
+                               metadatafile="${emma.coverage.absolute.file}">
+                            <filter excludes="${emma.default.filter}" />
+                            <filter value="${emma.filter}" />
+                        </instr>
+                    </emma>
+                </then>
+            </if>
+
             <!-- if the project is a library then we generate a jar file -->
             <if condition="${project.is.library}">
                 <then>
-                    <echo>Creating library output jar file...</echo>
+                    <echo level="info">Creating library output jar file...</echo>
                     <property name="out.library.jar.file" location="${out.absolute.dir}/classes.jar" />
                     <if>
                         <condition>
                             <length string="${android.package.excludes}" trim="true" when="greater" length="0" />
                         </condition>
                         <then>
-                            <echo>Custom jar packaging exclusion: ${android.package.excludes}</echo>
+                            <echo level="info">Custom jar packaging exclusion: ${android.package.excludes}</echo>
                         </then>
                     </if>
+
+                    <propertybyreplace name="project.app.package.path" input="${project.app.package}" replace="." with="/" />
+
                     <jar destfile="${out.library.jar.file}">
-                        <fileset dir="${out.classes.absolute.dir}" excludes="**/R.class **/R$*.class"/>
+                        <fileset dir="${out.classes.absolute.dir}"
+                                includes="**/*.class"
+                                excludes="${project.app.package.path}/R.class ${project.app.package.path}/R$*.class ${project.app.package.path}/Manifest.class ${project.app.package.path}/Manifest$*.class ${project.app.package.path}/BuildConfig.class"/>
                         <fileset dir="${source.absolute.dir}" excludes="**/*.java ${android.package.excludes}" />
                     </jar>
                 </then>
             </if>
 
-            <!-- if the project is instrumented, intrument the classes -->
-            <if condition="${build.is.instrumented}">
-                <then>
-                    <echo>Instrumenting classes from ${out.absolute.dir}/classes...</echo>
-                    <!-- It only instruments class files, not any external libs -->
-                    <emma enabled="true">
-                        <instr verbosity="${verbosity}"
-                               mode="overwrite"
-                               instrpath="${out.absolute.dir}/classes"
-                               outdir="${out.absolute.dir}/classes">
-                        </instr>
-                        <!-- TODO: exclusion filters on R*.class and allowing custom exclusion from
-                             user defined file -->
-                    </emma>
-                </then>
-            </if>
         </do-only-if-manifest-hasCode>
     </target>
 
@@ -762,7 +797,7 @@
                      all the jar files separated by a platform path-separator.
                      Each path must be quoted if it contains spaces.
                 -->
-                <pathconvert property="android.libraryjars" refid="android.target.classpath">
+                <pathconvert property="project.target.classpath.value" refid="project.target.class.path">
                     <firstmatchmapper>
                         <regexpmapper from='^([^ ]*)( .*)$$' to='"\1\2"'/>
                         <identitymapper/>
@@ -772,31 +807,43 @@
                 <!-- Build a path object with all the jar files that must be obfuscated.
                      This include the project compiled source code and any 3rd party jar
                      files. -->
-                <path id="project.jars.ref">
+                <path id="project.all.classes.path">
                     <pathelement location="${preobfuscate.jar.file}" />
-                    <path refid="jar.libs.ref" />
+                    <path refid="project.all.jars.path" />
                 </path>
                 <!-- Set the project jar files Path object into a single property. It'll be
                      all the jar files separated by a platform path-separator.
                      Each path must be quoted if it contains spaces.
                 -->
-                <pathconvert property="project.jars" refid="project.jars.ref">
+                <pathconvert property="project.all.classes.value" refid="project.all.classes.path">
                     <firstmatchmapper>
                         <regexpmapper from='^([^ ]*)( .*)$$' to='"\1\2"'/>
                         <identitymapper/>
                     </firstmatchmapper>
                 </pathconvert>
 
+                <!-- Turn the path property ${proguard.config} from an A:B:C property
+                     into a series of includes: -include A -include B -include C
+                     suitable for processing by the ProGuard task. Note - this does
+                     not include the leading '-include "' or the closing '"'; those
+                     are added under the <proguard> call below.
+                -->
+                <path id="proguard.configpath">
+                    <pathelement path="${proguard.config}"/>
+                </path>
+                <pathconvert pathsep='" -include "' property="proguard.configcmd" refid="proguard.configpath"/>
+
                 <mkdir   dir="${obfuscate.absolute.dir}" />
                 <delete file="${preobfuscate.jar.file}"/>
                 <delete file="${obfuscated.jar.file}"/>
                 <jar basedir="${out.classes.absolute.dir}"
                     destfile="${preobfuscate.jar.file}" />
                 <proguard>
-                    @${proguard.config}
-                    -injars       ${project.jars}
+                    -include      "${proguard.configcmd}"
+                    -include      "${out.absolute.dir}/proguard.txt"
+                    -injars       ${project.all.classes.value}
                     -outjars      "${obfuscated.jar.file}"
-                    -libraryjars  ${android.libraryjars}
+                    -libraryjars  ${project.target.classpath.value}
                     -dump         "${obfuscate.absolute.dir}/dump.txt"
                     -printseeds   "${obfuscate.absolute.dir}/seeds.txt"
                     -printusage   "${obfuscate.absolute.dir}/usage.txt"
@@ -846,33 +893,55 @@
          Some custom apk with specific configuration have been
          declared in default.properties.
          -->
-    <target name="-package-resources">
+    <target name="-package-resources" depends="-crunch">
         <!-- only package resources if *not* a library project -->
         <do-only-if-not-library elseText="Library project: do not package resources..." >
-	<exec executable="${aapt}" failonerror="true">
-	  <arg value="package" />
-	  <arg value="-f" />
-	  <arg value="-v" />
-	  <arg value="--version-code" />
-	  <arg value="${version.code}" />
-	  <arg value="--debug-mode" />
-	  <arg value="-m" />
-	  <arg value="-u" />
-	  <arg value="-J" />
- 	  <arg path="${gen.absolute.dir}" />
-	  <arg value="-M" />
-	  <arg path="AndroidManifest.xml" />
-	  <arg value="-I" />
-	  <arg path="${android.jar}" />
-	  <arg value="-F" />
-	  <arg path="${out.absolute.dir}/${resource.package.file.name}" />
-	  <arg value="-S" />
-	  <arg path="${resource.absolute.dir}" />
-	  <arg value="--rename-manifest-package"/> 
-	  <arg value="${linphone.package.name}"/> 
-	  <arg value="--custom-package" />
-	  <arg value="${linphone.package.name}"/> 
-	</exec> 
+            <!-- <aapt executable="${aapt}"
+                    command="package"
+                    versioncode="${version.code}"
+                    versionname="${version.name}"
+                    debug="${build.is.packaging.debug}"
+                    manifest="${out.manifest.abs.file}"
+                    assets="${asset.absolute.dir}"
+                    androidjar="${project.target.android.jar}"
+                    apkfolder="${out.absolute.dir}"
+                    nocrunch="${build.packaging.nocrunch}"
+                    resourcefilename="${resource.package.file.name}"
+                    resourcefilter="${aapt.resource.filter}"
+                    libraryResFolderPathRefid="project.library.res.folder.path"
+                    libraryPackagesRefid="project.library.packages"
+                    previousBuildType="${build.last.target}"
+                    buildType="${build.target}"
+                    ignoreAssets="${aapt.ignore.assets}">
+                <res path="${out.res.absolute.dir}" />
+                <res path="${resource.absolute.dir}" />
+                <nocompress /> forces no compression on any files in assets or res/raw
+                <nocompress extension="xml" /> forces no compression on specific file extensions in assets and res/raw
+            </aapt> -->
+            <exec executable="${aapt}" failonerror="true">
+			  <arg value="package" />
+			  <arg value="-f" />
+			  <arg value="-v" />
+			  <arg value="--version-code" />
+			  <arg value="${version.code}" />
+			  <arg value="--debug-mode" />
+			  <arg value="-m" />
+			  <arg value="-u" />
+			  <arg value="-J" />
+		 	  <arg path="${gen.absolute.dir}" />
+			  <arg value="-M" />
+			  <arg path="${out.manifest.abs.file}" />
+			  <arg value="-I" />
+			  <arg path="${project.target.android.jar}" />
+			  <arg value="-F" />
+			  <arg path="${out.absolute.dir}/${resource.package.file.name}" />
+			  <arg value="-S" />
+			  <arg path="${resource.absolute.dir}" />
+			  <arg value="--rename-manifest-package"/> 
+			  <arg value="${linphone.package.name}"/> 
+			  <arg value="--custom-package" />
+			  <arg value="${linphone.package.name}"/> 
+			</exec> 
         </do-only-if-not-library>
     </target>
 
@@ -896,25 +965,44 @@
         </do-only-if-not-library>
     </target>
 
+    <target name="-post-package" />
+    <target name="-post-build" />
+
     <target name="-set-mode-check">
-        <fail if="out.final.file"
+        <fail if="build.is.mode.set"
                 message="Cannot run two different modes at the same time. If you are running more than one debug/release/instrument type targets, call them from different Ant calls." />
     </target>
 
-    <!-- ********** Debug specific targets ********** -->
+    <!-- ******************************************************* -->
+    <!-- **************** Debug specific targets *************** -->
+    <!-- ******************************************************* -->
 
     <target name="-set-debug-files" depends="-set-mode-check">
 
         <property name="out.packaged.file" location="${out.absolute.dir}/${ant.project.name}-debug-unaligned.apk" />
         <property name="out.final.file" location="${out.absolute.dir}/${ant.project.name}-debug.apk" />
+        <property name="build.is.mode.set" value="true" />
     </target>
 
 
-    <target name="-set-debug-mode">
+    <target name="-set-debug-mode" depends="-setup">
         <!-- record the current build target -->
         <property name="build.target" value="debug" />
 
-        <property name="build.is.instrumented" value="false" />
+        <if>
+            <condition>
+                <and>
+                    <istrue value="${project.is.testapp}" />
+                    <istrue value="${emma.enabled}" />
+                </and>
+            </condition>
+            <then>
+                <property name="build.is.instrumented" value="true" />
+            </then>
+            <else>
+                <property name="build.is.instrumented" value="false" />
+            </else>
+        </if>
 
         <!-- whether the build is a debug build. always set. -->
         <property name="build.is.packaging.debug" value="true" />
@@ -922,6 +1010,9 @@
         <!-- signing mode: debug -->
         <property name="build.is.signing.debug" value="true" />
 
+        <!-- Renderscript optimization level: none -->
+        <property name="renderscript.opt.level" value="${renderscript.debug.opt.level}" />
+
     </target>
 
     <target name="-debug-obfuscation-check">
@@ -930,14 +1021,15 @@
     </target>
 
     <!-- Builds debug output package -->
-    <target name="-do-debug" depends="-set-debug-mode, -debug-obfuscation-check, -package">
+    <target name="-do-debug" depends="-set-debug-mode, -debug-obfuscation-check, -package, -post-package">
         <!-- only create apk if *not* a library project -->
         <do-only-if-not-library elseText="Library project: do not create apk..." >
             <sequential>
                 <zipalign-helper in.package="${out.packaged.file}" out.package="${out.final.file}" />
-                <echo>Debug Package: ${out.final.file}</echo>
+                <echo level="info">Debug Package: ${out.final.file}</echo>
             </sequential>
         </do-only-if-not-library>
+        <record-build-info />
     </target>
 
     <target name="init" description="copy linphone java files into right directories.">
@@ -964,16 +1056,27 @@
     <target name="delete-temp" description="remove linphone java files into right directories.">
         <delete dir="src/temp"/>
     </target>
-
+    
     <!-- Builds debug output package -->
-    <target name="debug" depends="clean, init, -set-debug-files, -do-debug, delete-temp"
+    <target name="debug" depends="clean, init, -set-debug-files, -do-debug, -post-build, delete-temp"
                 description="Builds the application and signs it with a debug key.">
-        
-        <record-build-info />
     </target>
 
+    <target name="run">
+	    <exec executable="adb">
+	        <arg value="shell"/>
+	        <arg value="am"/>
+	        <arg value="start"/>
+	        <arg value="-a"/>
+	        <arg value="android.intent.action.MAIN"/>
+	        <arg value="-n"/>
+	        <arg value="${linphone.package.name}/org.linphone.LinphoneLauncherActivity"/>
+	    </exec>
+	</target>
 
-    <!-- ********** Release specific targets ********** -->
+    <!-- ******************************************************* -->
+    <!-- *************** Release specific targets ************** -->
+    <!-- ******************************************************* -->
 
     <!-- called through target 'release'. Only executed if the keystore and
          key alias are known but not their password. -->
@@ -993,15 +1096,16 @@
         <!-- no release builds for library project -->
         <do-only-if-not-library elseText="" >
             <sequential>
-                <echo>No key.store and key.alias properties found in build.properties.</echo>
-                <echo>Please sign ${out.packaged.file} manually</echo>
-                <echo>and run zipalign from the Android SDK tools.</echo>
+                <echo level="info">No key.store and key.alias properties found in build.properties.</echo>
+                <echo level="info">Please sign ${out.packaged.file} manually</echo>
+                <echo level="info">and run zipalign from the Android SDK tools.</echo>
             </sequential>
         </do-only-if-not-library>
         <record-build-info />
     </target>
 
     <target name="-release-obfuscation-check">
+        <echo level="info">proguard.config is ${proguard.config}</echo>
         <condition property="proguard.enabled" value="true" else="false">
             <and>
                 <isset property="build.is.mode.release" />
@@ -1010,6 +1114,7 @@
         </condition>
         <if condition="${proguard.enabled}">
             <then>
+                <echo level="info">Proguard.config is enabled</echo>
                 <!-- Secondary dx input (jar files) is empty since all the
                      jar files will be in the obfuscated jar -->
                 <path id="out.dex.jar.input.ref" />
@@ -1020,6 +1125,7 @@
     <target name="-set-release-mode" depends="-set-mode-check">
         <property name="out.packaged.file" location="${out.absolute.dir}/${ant.project.name}-release-unsigned.apk" />
         <property name="out.final.file" location="${out.absolute.dir}/${ant.project.name}-release.apk" />
+        <property name="build.is.mode.set" value="true" />
 
         <!-- record the current build target -->
         <property name="build.target" value="release" />
@@ -1028,12 +1134,15 @@
 
         <!-- release mode is only valid if the manifest does not explicitly
              set debuggable to true. default is false. -->
-        <xpath input="AndroidManifest.xml" expression="/manifest/application/@android:debuggable"
+        <xpath input="${manifest.abs.file}" expression="/manifest/application/@android:debuggable"
                 output="build.is.packaging.debug" default="false"/>
 
         <!-- signing mode: release -->
         <property name="build.is.signing.debug" value="false" />
 
+        <!-- Renderscript optimization level: aggressive -->
+        <property name="renderscript.opt.level" value="${renderscript.release.opt.level}" />
+
         <if condition="${build.is.packaging.debug}">
             <then>
                 <echo>*************************************************</echo>
@@ -1049,54 +1158,44 @@
             </else>
         </if>
     </target>
-    
-    <target name="run">
-	    <exec executable="adb">
-	        <arg value="shell"/>
-	        <arg value="am"/>
-	        <arg value="start"/>
-	        <arg value="-a"/>
-	        <arg value="android.intent.action.MAIN"/>
-	        <arg value="-n"/>
-	        <arg value="${linphone.package.name}/org.linphone.LinphoneLauncherActivity"/>
-	    </exec>
-	</target>
-
-    <!-- This runs -package-release and -release-nosign first and then runs
-         only if release-sign is true (set in -release-check,
-         called by -release-no-sign)-->
-    <target name="release"
-                depends="clean, init, -set-release-mode, -release-obfuscation-check, -package, -release-prompt-for-password, -release-nosign"
-                if="has.keystore"
-                description="Builds the application. The generated apk file must be signed before
-                            it is published.">
 
+    <target name="-release-sign" if="has.keystore" >
         <!-- only create apk if *not* a library project -->
         <do-only-if-not-library elseText="Library project: do not create apk..." >
             <sequential>
                 <property name="out.unaligned.file" location="${out.absolute.dir}/${ant.project.name}-release-unaligned.apk" />
 
                 <!-- Signs the APK -->
-                <echo>Signing final apk...</echo>
-                <signjar
-                        jar="${out.packaged.file}"
-                        signedjar="${out.unaligned.file}"
+                <echo level="info">Signing final apk...</echo>
+                <signapk
+                        input="${out.packaged.file}"
+                        output="${out.unaligned.file}"
                         keystore="${key.store}"
                         storepass="${key.store.password}"
                         alias="${key.alias}"
-                        keypass="${key.alias.password}"
-                        verbose="${verbose}" />
+                        keypass="${key.alias.password}"/>
 
                 <!-- Zip aligns the APK -->
-                <zipalign-helper in.package="${out.unaligned.file}"
-                                           out.package="${out.final.file}" />
-                <echo>Release Package: ${out.final.file}</echo>
+                <zipalign-helper
+                        in.package="${out.unaligned.file}"
+                        out.package="${out.final.file}" />
+                <echo level="info">Release Package: ${out.final.file}</echo>
             </sequential>
         </do-only-if-not-library>
         <record-build-info />
     </target>
 
-    <!-- ********** Instrumented specific targets ********** -->
+    <!-- This runs -package-release and -release-nosign first and then runs
+         only if release-sign is true (set in -release-check,
+         called by -release-no-sign)-->
+    <target name="release"
+                depends="-set-release-mode, -release-obfuscation-check, -package, -post-package, -release-prompt-for-password, -release-nosign, -release-sign, -post-build"
+                description="Builds the application in release mode.">
+    </target>
+
+    <!-- ******************************************************* -->
+    <!-- ************ Instrumented specific targets ************ -->
+    <!-- ******************************************************* -->
 
     <!-- These targets are specific for the project under test when it
          gets compiled by the test projects in a way that will make it
@@ -1105,6 +1204,7 @@
     <target name="-set-instrumented-mode" depends="-set-mode-check">
         <property name="out.packaged.file" location="${out.absolute.dir}/${ant.project.name}-instrumented-unaligned.apk" />
         <property name="out.final.file" location="${out.absolute.dir}/${ant.project.name}-instrumented.apk" />
+        <property name="build.is.mode.set" value="true" />
 
         <!-- whether the build is an instrumented build. -->
         <property name="build.is.instrumented" value="true" />
@@ -1117,13 +1217,15 @@
         <do-only-if-not-library elseText="Library project: do not create apk..." >
             <sequential>
                 <zipalign-helper in.package="${out.packaged.file}" out.package="${out.final.file}" />
-                <echo>Instrumented Package: ${out.final.file}</echo>
+                <echo level="info">Instrumented Package: ${out.final.file}</echo>
             </sequential>
         </do-only-if-not-library>
         <record-build-info />
     </target>
 
-    <!-- ********** Test project specific targets ********** -->
+    <!-- ******************************************************* -->
+    <!-- ************ Test project specific targets ************ -->
+    <!-- ******************************************************* -->
 
     <!-- enable code coverage -->
     <target name="emma">
@@ -1131,43 +1233,67 @@
     </target>
 
     <!-- fails if the project is not a test project -->
-    <target name="-test-project-check">
-        <!-- can't use project.is.test since the setup target is not run -->
+    <target name="-test-project-check" depends="-setup">
         <if>
             <condition>
-                <isset property="tested.project.dir" />
+                <and>
+                    <isfalse value="${project.is.test}" />
+                    <isfalse value="${project.is.testapp}" />
+                </and>
             </condition>
-            <else>
+            <then>
                 <fail message="Project is not a test project." />
-            </else>
+            </then>
         </if>
     </target>
 
-    <!-- Installs the tested project. This make sure to install the proper package based on
-         the value of emma.enabled -->
-    <target name="-install-tested-project" depends="-test-project-check, -setup">
-        <!-- figure out which tested package to install based on emma.enabled -->
-        <condition property="tested.project.install.target" value="installi" else="installd">
-            <isset property="emma.enabled" />
-        </condition>
-        <subant target="${tested.project.install.target}" failonerror="true">
-            <fileset dir="${tested.project.absolute.dir}" includes="build.xml" />
-        </subant>
-    </target>
-
     <target name="test" depends="-test-project-check"
                 description="Runs tests from the package defined in test.package property">
-
-        <property name="tested.project.absolute.dir" location="${tested.project.dir}" />
-
         <property name="test.runner" value="android.test.InstrumentationTestRunner" />
 
-        <!-- Application package of the tested project extracted from its manifest file -->
-        <xpath input="${tested.project.absolute.dir}/AndroidManifest.xml"
-                expression="/manifest/@package" output="tested.manifest.package" />
+        <if condition="${project.is.test}">
+        <then>
+            <property name="tested.project.absolute.dir" location="${tested.project.dir}" />
+
+            <!-- Application package of the tested project extracted from its manifest file -->
+            <xpath input="${tested.project.absolute.dir}/AndroidManifest.xml"
+                    expression="/manifest/@package" output="tested.project.app.package" />
+
+            <if condition="${emma.enabled}">
+                <then>
+                    <getprojectpaths projectPath="${tested.project.absolute.dir}"
+                            binOut="tested.project.out.absolute.dir"
+                            srcOut="tested.project.source.absolute.dir" />
+
+                    <getlibpath projectPath="${tested.project.absolute.dir}"
+                            libraryFolderPathOut="tested.project.lib.source.path"
+                            leaf="@{source.dir}" />
+
+                </then>
+            </if>
+
+        </then>
+        <else>
+            <!-- this is a test app, the tested package is the app's own package -->
+            <property name="tested.project.app.package" value="${project.app.package}" />
+
+            <if condition="${emma.enabled}">
+                <then>
+                    <property name="tested.project.out.absolute.dir" value="${out.absolute.dir}" />
+                    <property name="tested.project.source.absolute.dir" value="${source.absolute.dir}" />
+
+                    <getlibpath
+                            libraryFolderPathOut="tested.project.lib.source.path"
+                            leaf="@{source.dir}" />
+
+                </then>
+            </if>
+
+        </else>
+        </if>
 
         <property name="emma.dump.file"
-                value="/data/data/${tested.manifest.package}/coverage.ec" />
+                value="/data/data/${tested.project.app.package}/coverage.ec" />
 
         <if condition="${emma.enabled}">
             <then>
@@ -1179,30 +1305,37 @@
                            <arg value="${emma.dump.file}" />
                     </extra-instrument-args>
                 </run-tests-helper>
-                <echo>Downloading coverage file into project directory...</echo>
+                <echo level="info">Downloading coverage file into project directory...</echo>
                 <exec executable="${adb}" failonerror="true">
                     <arg line="${adb.device.arg}" />
                     <arg value="pull" />
                     <arg value="${emma.dump.file}" />
-                    <arg value="coverage.ec" />
+                    <arg path="${out.absolute.dir}/coverage.ec" />
                 </exec>
-                <echo>Extracting coverage report...</echo>
+                <echo level="info">Extracting coverage report...</echo>
+
+                <pathconvert property="tested.project.lib.source.path.value" refid="tested.project.lib.source.path">
+                    <firstmatchmapper>
+                        <regexpmapper from='^([^ ]*)( .*)$$' to='"\1\2"'/>
+                        <identitymapper/>
+                    </firstmatchmapper>
+                </pathconvert>
+
+
                 <emma>
-                    <report sourcepath="${tested.project.absolute.dir}/${source.dir}"
-                                      verbosity="${verbosity}">
+                    <report sourcepath="${tested.project.source.absolute.dir}:${tested.project.lib.source.path.value}"
+                            verbosity="${verbosity}">
                         <!-- TODO: report.dir or something like should be introduced if necessary -->
-                        <infileset dir=".">
-                            <include name="coverage.ec" />
-                            <include name="coverage.em" />
-                        </infileset>
+                        <infileset file="${out.absolute.dir}/coverage.ec" />
+                        <infileset file="${tested.project.out.absolute.dir}/coverage.em" />
                         <!-- TODO: reports in other, indicated by user formats -->
-                        <html outfile="coverage.html" />
+                        <html outfile="${out.absolute.dir}/coverage.html" />
                    </report>
                 </emma>
-                <echo>Cleaning up temporary files...</echo>
-                <delete file="coverage.ec" />
-                <delete file="coverage.em" />
-                <echo>Saving the report file in ${basedir}/coverage/coverage.html</echo>
+                <echo level="info">Cleaning up temporary files...</echo>
+                <delete file="${out.absolute.dir}/coverage.ec" />
+                <delete file="${out.absolute.dir}/coverage.em" />
+                <echo level="info">Saving the report file in ${out.absolute.dir}/coverage.html</echo>
             </then>
             <else>
                 <run-tests-helper />
@@ -1211,7 +1344,9 @@
     </target>
 
 
-    <!-- ********** Install/uninstall specific targets ********** -->
+    <!-- ******************************************************* -->
+    <!-- ********** Install/uninstall specific targets ********* -->
+    <!-- ******************************************************* -->
 
     <target name="install"
                 description="Installs the newly build package. Must be used in conjunction with a build target
@@ -1229,18 +1364,42 @@
                             <resourceexists>
                                 <file file="${out.final.file}"/>
                             </resourceexists>
-                            </condition>
+                        </condition>
                         <then>
-                            <echo>Installing ${out.final.file} onto default emulator or device...</echo>
+                            <echo level="info">Installing ${out.final.file} onto default emulator or device...</echo>
                             <exec executable="${adb}" failonerror="true">
                                 <arg line="${adb.device.arg}" />
                                 <arg value="install" />
                                 <arg value="-r" />
                                 <arg path="${out.final.file}" />
                             </exec>
+
+                            <!-- now install the tested project if applicable -->
+                            <!-- can't use project.is.test since the setup target might not have run -->
+                            <if>
+                                <condition>
+                                    <and>
+                                        <isset property="tested.project.dir" />
+                                        <not>
+                                            <isset property="dont.do.deps" />
+                                        </not>
+                                    </and>
+                                </condition>
+                                <then>
+                                    <property name="tested.project.absolute.dir" location="${tested.project.dir}" />
+
+                                    <!-- figure out which tested package to install based on emma.enabled -->
+                                    <condition property="tested.project.install.target" value="installi" else="installd">
+                                        <isset property="emma.enabled" />
+                                    </condition>
+                                    <subant target="${tested.project.install.target}" failonerror="true">
+                                        <fileset dir="${tested.project.absolute.dir}" includes="build.xml" />
+                                    </subant>
+                                </then>
+                            </if>
                         </then>
                         <else>
-                            <fail message="File {out.final.file} does not exist." />
+                            <fail message="File ${out.final.file} does not exist." />
                         </else>
                     </if>
                 </then>
@@ -1273,45 +1432,50 @@
             description="Installs (only) the release package." />
     <target name="installi" depends="-set-instrumented-mode, install"
             description="Installs (only) the instrumented package." />
-    <target name="installt" depends="-install-tested-project, installd"
+    <target name="installt" depends="-test-project-check, installd"
             description="Installs (only) the test and tested packages." />
 
 
     <!-- Uninstalls the package from the default emulator/device -->
-    <target name="uninstall"
+    <target name="uninstall" depends="-setup"
                 description="Uninstalls the application from a running emulator or device.">
-        <!-- Name of the application package extracted from manifest file -->
-        <xpath input="AndroidManifest.xml" expression="/manifest/@package"
-                output="manifest.package" />
-
         <if>
             <condition>
-                <isset property="manifest.package" />
+                <isset property="project.app.package" />
             </condition>
             <then>
-                <uninstall-helper app.package="${manifest.package}" />
+                <uninstall-helper app.package="${project.app.package}" />
             </then>
             <else>
-                <echo>Could not find application package in manifest. Cannot run 'adb uninstall'.</echo>
+                <fail message="Could not find application package in manifest. Cannot run 'adb uninstall'." />
             </else>
         </if>
 
-        <if condition="${project.is.test}">
+        <!-- Now uninstall the tested project, if applicable -->
+        <if>
+            <condition>
+                <and>
+                    <istrue value="${project.is.test}" />
+                    <not>
+                        <isset property="dont.do.deps" />
+                    </not>
+                </and>
+            </condition>
             <then>
                 <property name="tested.project.absolute.dir" location="${tested.project.dir}" />
 
                 <!-- Application package of the tested project extracted from its manifest file -->
                 <xpath input="${tested.project.absolute.dir}/AndroidManifest.xml"
-                    expression="/manifest/@package" output="tested.manifest.package" />
+                    expression="/manifest/@package" output="tested.project.app.package" />
                 <if>
                     <condition>
-                        <isset property="tested.manifest.package" />
+                        <isset property="tested.project.app.package" />
                     </condition>
                     <then>
-                        <uninstall-helper app.package="${tested.manifest.package}" />
+                        <uninstall-helper app.package="${tested.project.app.package}" />
                     </then>
                     <else>
-                        <echo>Could not find tested application package in manifest. Cannot run 'adb uninstall'.</echo>
+                        <fail message="Could not find tested application package in manifest. Cannot run 'adb uninstall'." />
                     </else>
                 </if>
             </then>
@@ -1320,6 +1484,10 @@
     </target>
 
 
+    <!-- ******************************************************* -->
+    <!-- ************************* Help ************************ -->
+    <!-- ******************************************************* -->
+
     <target name="help">
         <!-- displays starts at col 13
               |13                                                              80| -->
@@ -1330,13 +1498,19 @@
         <echo>              (tested projects and libraries)at the same time</echo>
         <echo>              using: 'ant all clean'</echo>
         <echo>   debug:     Builds the application and signs it with a debug key.</echo>
+        <echo>              The 'nodeps' target can be used to only build the</echo>
+        <echo>              current project and ignore the libraries using:</echo>
+        <echo>              'ant nodeps debug'</echo>
         <echo>   release:   Builds the application. The generated apk file must be</echo>
         <echo>              signed before it is published.</echo>
+        <echo>              The 'nodeps' target can be used to only build the</echo>
+        <echo>              current project and ignore the libraries using:</echo>
+        <echo>              'ant nodeps release'</echo>
         <echo>   instrument:Builds an instrumented package and signs it with a</echo>
         <echo>              debug key.</echo>
         <echo>   test:      Runs the tests. Project must be a test project and</echo>
         <echo>              must have been built. Typical usage would be:</echo>
-        <echo>                  ant [emma] debug installt test</echo>
+        <echo>                  ant [emma] debug install test</echo>
         <echo>   emma:      Transiently enables code coverage for subsequent</echo>
         <echo>              targets.</echo>
         <echo>   install:   Installs the newly build package. Must either be used</echo>
@@ -1348,8 +1522,10 @@
         <echo>   installd:  Installs (only) the debug package.</echo>
         <echo>   installr:  Installs (only) the release package.</echo>
         <echo>   installi:  Installs (only) the instrumented package.</echo>
-        <echo>   installt:  Installs (only) the test and tested packages.</echo>
+        <echo>   installt:  Installs (only) the test and tested packages (unless</echo>
+        <echo>              nodeps is used as well.</echo>
         <echo>   uninstall: Uninstalls the application from a running emulator or</echo>
-        <echo>              device.</echo>
+        <echo>              device. Also uninstall tested package if applicable</echo>
+        <echo>              unless 'nodeps' is used as well.</echo>
     </target>
-</project>
+</project>
\ No newline at end of file
diff --git a/res/drawable/numpad_eight.xml b/res/drawable/numpad_eight.xml
index 7f90f5a39..9c6ece841 100644
--- a/res/drawable/numpad_eight.xml
+++ b/res/drawable/numpad_eight.xml
@@ -3,6 +3,6 @@
     <item android:state_pressed="true" 
         android:drawable="@drawable/numpad_eight_over" />
     <item
-         android:drawable="@drawable/numpad_eight_actif" />
+         android:drawable="@drawable/numpad_eight_default" />
 </selector>
 
diff --git a/res/drawable/numpad_eight_default.png b/res/drawable/numpad_eight_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..a3c0d8033c2fd05a51b44cb489504728ada97352
GIT binary patch
literal 6016
zcmbVQbyQScyB`VZM!Fo3l9(Zfjv<8^q`PMbVVI!=RJuWsMp7gNr9%*;TaXq7hAxp3
zBqT4s-}`>|-nG7U|F~zZbIyMDexBcxdq3-(=!bB1GGZoT002OysiC5G^Pao8-3f04
z0JjDfE_rSUMlV$pFMYIwmyfLn5}<@Y+aWnLQMQgqJ)|wd&wT(X3jp9cI2)LFnZUHA
z?a?S9+dn))z9`I%Gyov0;ES=fcR_k_*dZOA-Q<9K&22yqXM`NkSR4j|VW3DSXN@Nw
zNc|^p1N$c~_EHF-f;@+;uk;N73h8Cb;fr#0^OW|L1OA08eKY<uEez!Ni^a=D4)`yl
zOkfW=plA;yhqw?(&>kcK;*bCffknk6B_#zoL_lDWFi1ogEFuV&lol0{27x&KzJNE{
zJP;1jdMavv>$;)jfKFas7-?Z)A0HnfA5kH+hodl9N=oVvhKPvZ4TqqopPQGhub`VJ
z=RXK4NKbnYXN;FK+KuB6qOBd;+e;33W9h$KKw)68e*?RD{vD{BkO}+RVuZm$AYl~h
zk6(XrdwS_1|J#iJ$n9z1hd~PKAwALF9`-l+aNzt$_$GG$x1v9cH`Yk&csSoA#nx2?
zZSRdjx_N1;$N_Iwgb>aMX%H9!0)r*RK$0RL2?!Xhqy~jbDMKaIB%qQYDJAef82?FD
zMMVN6r2-LyNPtzqU{x?g6m%o1ETJT+tgI|0qV|uhrkkgit(!gaAHB{udR4&Ul2DK+
z=>L?JhI$}vz0e*8Xte7;74Xmr?S=MqLSs0f`r;fgTYG1>KlGpU{L5Pvq=)lkBtp#t
zjpFz#zS7SBK|cs01(8w%D}hD-<u^o4LPQB7DlQ==E(R7C69N7$i}?S<O!&qa;XlRk
zKZ@m_shbM?GyHey-w^-aJV>{j9piDcHRg-TtN;L-Doqt71K%0Dl$1pKJObb2)4MMn
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

literal 0
HcmV?d00001

diff --git a/res/drawable/numpad_five.xml b/res/drawable/numpad_five.xml
index 62ad90d73..3a3c7dcbd 100644
--- a/res/drawable/numpad_five.xml
+++ b/res/drawable/numpad_five.xml
@@ -3,6 +3,6 @@
     <item android:state_pressed="true" 
         android:drawable="@drawable/numpad_five_over" />
     <item
-         android:drawable="@drawable/numpad_five_actif" />
+         android:drawable="@drawable/numpad_five_default" />
 </selector>
 
diff --git a/res/drawable/numpad_five_default.png b/res/drawable/numpad_five_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..023eee43b282e235b025410bc176e2944b68546f
GIT binary patch
literal 4853
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

literal 0
HcmV?d00001

diff --git a/res/drawable/numpad_four.xml b/res/drawable/numpad_four.xml
index 5b8d45815..7fcef5d78 100644
--- a/res/drawable/numpad_four.xml
+++ b/res/drawable/numpad_four.xml
@@ -3,6 +3,6 @@
     <item android:state_pressed="true" 
         android:drawable="@drawable/numpad_four_over" />
     <item
-         android:drawable="@drawable/numpad_four_actif" />
+         android:drawable="@drawable/numpad_four_default" />
 </selector>
 
diff --git a/res/drawable/numpad_four_default.png b/res/drawable/numpad_four_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa788a74584bd531db23d5c9383f9127a6f197ac
GIT binary patch
literal 4844
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
Q9shsAYU-hjG^|7Z1*H&yiU0rr

literal 0
HcmV?d00001

diff --git a/res/drawable/numpad_nine.xml b/res/drawable/numpad_nine.xml
index b82103179..51a5637bc 100644
--- a/res/drawable/numpad_nine.xml
+++ b/res/drawable/numpad_nine.xml
@@ -3,6 +3,6 @@
     <item android:state_pressed="true" 
         android:drawable="@drawable/numpad_nine_over" />
     <item
-         android:drawable="@drawable/numpad_nine_actif" />
+         android:drawable="@drawable/numpad_nine_default" />
 </selector>
 
diff --git a/res/drawable/numpad_nine_default.png b/res/drawable/numpad_nine_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..594a49d5f82b4805bd5f9bc86f7aae0dde704428
GIT binary patch
literal 5808
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
OSzAL-y;99K^#1@`VssAx

literal 0
HcmV?d00001

diff --git a/res/drawable/numpad_one.xml b/res/drawable/numpad_one.xml
index 2c29d616b..0e84886ba 100644
--- a/res/drawable/numpad_one.xml
+++ b/res/drawable/numpad_one.xml
@@ -3,6 +3,6 @@
     <item android:state_pressed="true" 
         android:drawable="@drawable/numpad_one_over" />
     <item
-         android:drawable="@drawable/numpad_one_actif" />
+         android:drawable="@drawable/numpad_one_default" />
 </selector>
 
diff --git a/res/drawable/numpad_one_default.png b/res/drawable/numpad_one_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..07f8d0ecff323f1abf6f946fdc39a059a5414f97
GIT binary patch
literal 3432
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
LJwU!gJQ@05llI0?

literal 0
HcmV?d00001

diff --git a/res/drawable/numpad_seven.xml b/res/drawable/numpad_seven.xml
index c676b7fc7..ce132ee85 100644
--- a/res/drawable/numpad_seven.xml
+++ b/res/drawable/numpad_seven.xml
@@ -3,6 +3,6 @@
     <item android:state_pressed="true" 
         android:drawable="@drawable/numpad_seven_over" />
     <item
-         android:drawable="@drawable/numpad_seven_actif" />
+         android:drawable="@drawable/numpad_seven_default" />
 </selector>
 
diff --git a/res/drawable/numpad_seven_default.png b/res/drawable/numpad_seven_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..85ea3ddcfd245d3885e9a514d0ba276c46b93539
GIT binary patch
literal 4278
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
Vk|gRvQ+NL)U~HXGcWk`l{sUH;WnlmS

literal 0
HcmV?d00001

diff --git a/res/drawable/numpad_sharp.xml b/res/drawable/numpad_sharp.xml
index 64940acdb..00f95053c 100644
--- a/res/drawable/numpad_sharp.xml
+++ b/res/drawable/numpad_sharp.xml
@@ -3,6 +3,6 @@
     <item android:state_pressed="true" 
         android:drawable="@drawable/numpad_sharp_over" />
     <item
-         android:drawable="@drawable/numpad_sharp_actif" />
+         android:drawable="@drawable/numpad_sharp_default" />
 </selector>
 
diff --git a/res/drawable/numpad_sharp_default.png b/res/drawable/numpad_sharp_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..c551d912128653c27fc30a20626b0605c88e08b5
GIT binary patch
literal 5204
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
D4^$Ov

literal 0
HcmV?d00001

diff --git a/res/drawable/numpad_six.xml b/res/drawable/numpad_six.xml
index 2c75863dd..772a76289 100644
--- a/res/drawable/numpad_six.xml
+++ b/res/drawable/numpad_six.xml
@@ -3,6 +3,6 @@
     <item android:state_pressed="true" 
         android:drawable="@drawable/numpad_six_over" />
     <item
-         android:drawable="@drawable/numpad_six_actif" />
+         android:drawable="@drawable/numpad_six_default" />
 </selector>
 
diff --git a/res/drawable/numpad_six_default.png b/res/drawable/numpad_six_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..5404d14ec95fce4ba677b1df3c38c9339592cd77
GIT binary patch
literal 5843
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

literal 0
HcmV?d00001

diff --git a/res/drawable/numpad_star.xml b/res/drawable/numpad_star.xml
index 9d8b3fb12..ba25790e4 100644
--- a/res/drawable/numpad_star.xml
+++ b/res/drawable/numpad_star.xml
@@ -3,6 +3,6 @@
     <item android:state_pressed="true" 
         android:drawable="@drawable/numpad_star_over" />
     <item
-         android:drawable="@drawable/numpad_star_actif" />
+         android:drawable="@drawable/numpad_star_default" />
 </selector>
 
diff --git a/res/drawable/numpad_star_default.png b/res/drawable/numpad_star_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..41c13aa406ed6590bed9cc52e82a93a1c658e6c5
GIT binary patch
literal 4479
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
Y@>+`1B2`k)@B9+MSy-DFo1G8)Ki~G!uK)l5

literal 0
HcmV?d00001

diff --git a/res/drawable/numpad_three.xml b/res/drawable/numpad_three.xml
index 2e846d9ad..64d9d9ab5 100644
--- a/res/drawable/numpad_three.xml
+++ b/res/drawable/numpad_three.xml
@@ -3,6 +3,6 @@
     <item android:state_pressed="true" 
         android:drawable="@drawable/numpad_three_over" />
     <item
-         android:drawable="@drawable/numpad_three_actif" />
+         android:drawable="@drawable/numpad_three_default" />
 </selector>
 
diff --git a/res/drawable/numpad_three_default.png b/res/drawable/numpad_three_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..5a489c4934c4285208892cacb6b55e58b8fd2cbc
GIT binary patch
literal 5111
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

literal 0
HcmV?d00001

diff --git a/res/drawable/numpad_two.xml b/res/drawable/numpad_two.xml
index 759b35ffb..e65e2a7ed 100644
--- a/res/drawable/numpad_two.xml
+++ b/res/drawable/numpad_two.xml
@@ -3,6 +3,6 @@
     <item android:state_pressed="true" 
         android:drawable="@drawable/numpad_two_over" />
     <item
-         android:drawable="@drawable/numpad_two_actif" />
+         android:drawable="@drawable/numpad_two_default" />
 </selector>
 
diff --git a/res/drawable/numpad_two_default.png b/res/drawable/numpad_two_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..0de47b0bbd8815739db625a28113e57f537c1db9
GIT binary patch
literal 4790
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
MSPR2P`ff4*1NVbt`v3p{

literal 0
HcmV?d00001

diff --git a/res/drawable/numpad_zero.xml b/res/drawable/numpad_zero.xml
index fc9e2facb..9caee9d41 100644
--- a/res/drawable/numpad_zero.xml
+++ b/res/drawable/numpad_zero.xml
@@ -3,6 +3,6 @@
     <item android:state_pressed="true" 
         android:drawable="@drawable/numpad_zero_over" />
     <item
-         android:drawable="@drawable/numpad_zero_actif" />
+         android:drawable="@drawable/numpad_zero_default" />
 </selector>
 
diff --git a/res/drawable/numpad_zero_default.png b/res/drawable/numpad_zero_default.png
new file mode 100644
index 0000000000000000000000000000000000000000..465a3c9f68d30a29cda706ebcc1b8d0831d538f9
GIT binary patch
literal 5173
zcmbVQc{r4P_aBjc8B5k;NJy9&%b1z$GubIiLMmen#xjG!*t28{StD!qwa5~(q%29u
zRzxUUvOlsDe$(?jJ@5PbUGMe&@w>0<zV36*eLiRVp7Z@)_Z@Z3P>Y3;pAi56u;^%`
zjVaFw%I!u^3jk1ce>oDTFnk_Y%sotqb{=GmI}V_3OSHj(bX+j@IAa{f*2k?Irvv~{
z+u=>kJ<JXCkyxUO4Ca@PjJJy`1q}cwsd~F&uueD+kPXfrPf!+FZ)z0*;cb;gZYUT)
z3|vt-2fVhgJI=({&=l+IghkkjsH%XJypa?GE;tVi$lJx4Ktg&ei~MO9Nuhs<!6KkP
zRXm)OMg9uP+~67rMRdo36l5UMSO^RPf<a}Va`K9bic%n12owT_$bzA=(ojXDoGcOo
z0sVc6P`tU@+98e6nt%JEaLOVM9v-epFqljx%aG+{i0<}aC<1}_WkXh0nxY|1@*#L&
zyrl`G^S>>iaU`re-qiz7B!GTd#Mlr$J(NW#k^Yr}i>rabKZXgUzY9ev8Q2@+3Wmx+
zz%DMo^7>Po<YA2aR~Y|Mn`G+aiUS+tNJLL}EM-0H&i@8eYWLqA{ZgbvgS_gFrz{G_
z8BN4`y5I;NI%s7P${QJ5ye$#}g+riFMR|y#ECdFJLe(`<D1-(|Q4@wzgdo(Rzis>{
zEE)}iAkc6W90o;0p;w@AIS2)+0aI7h(9l50YW~LR5J(;v0v7k%FP`G}Z>+|D#UfGe
zIE)9;-IPdl{@nrB9Ecu7k^|8dgfdY88DOw@!Y}^U^8A%88t0Dp!r5xN6J0=m))$HY
z5B?!=1RS9WRfo#`l{Z`yCaVsYQ-H}U$U_z6WkvqR+WvoP2Bri9{?#1+)-1n8ln(qw
z{?qyt=AYrg5hxSmP8khR@RuY207$8rx~ccLO>%MqHiyo8XHWQ%olTA$@ALSjpfFRG
z``-*t9<oS*7^dHQhCBI<$_;&p0QHy_bl$OCE}e`w9xQN)&wk-yz<};A=}C3yH3WSA
zb}mCDBSmEn#S<SN59(&-HV^NhEwG&*43i0_S72Hwf6^PXtiICw>5s%0ld-iMxl!38
zszB*tV#S40tQpH0zpMB8Vopv@#5*INH6+t4p0?bH`H&YImf1{G`+eU*CzJ_513a%>
zE?$HYNNyjMP29}X^F7mS`bn-P*6U+@fCl@gyay}1LcrBbv;D_*DOJ^^SGq}0zxubo
zg-6cDbd*H|ma_BSFn$|F^LDgI>tQ}!Oub$K_YGSMm?bQaItY+=^9%|cl-cx%Hyp~l
zJ#p={)Ydb!xrLvYVyiVjog%osQs@ic%Rq0xlkL?WT~wo*5u{qBz{Zgnt#^D}Xu?d6
zTgMa>WqDk@7W5p%S=|+My;8CyfVQCXYdgKK9mvxL1?^wV^*mTpTO55m(^A82z<)pc
z5FL{@Q`^8N-$U9P*VqF<R|}qeiy{-1eHdim$0vtff2_P$pw+<{(2CjFY2)8??D=(V
znZYdQ5$V3H>AN0mnJv}6T~SO+5GWf{Xa?&Wq|Pf*-<T9>u5>>_?Y_dehVVH6&45Ft
zwY<dxU&04cezw5&M9G3?1fMH4gF*g@l7<MgzJ4$BovBuwx7R$^Z2WF!W7^YaCF#=w
ztOP+*H`3vW;)Av9!=G=$l7%y*s(hGf9$A?4$-7J>MmT57k=aVnJLXzm`U*h%c4<31
z%(eQ>pGu<2yK!12EN_lCm&F}c3RohGH>zuzL!+X*%Qu*H`rS5}UXM8@YJ9eKX2E0j
z9x+_z*&WbNk$MuD%dRe1Q3LUMR=nJZx!$kreV~8(O*Y&wct3u3;_;W(uPZm>vb97$
zUDf+;7B!n8{f3U71!&<QxdtaKl+r~?gTxqk>=$^h->dR5Pn%-xe#GQP)<;#0_J$;#
z2<&$q+0V{}l$Yv6|KLr`rsh73yEIFk+P3E}GQ+IFA?vy?D%2IAreGiL9NgC5evau$
zLve02b?3LzZoQ@<Wd9)U+D>nw(~24+tapc(7pv+ppF7CDF!+9nQcz{ZC4@1R8i1uK
zDt?;QRUs}-Gt{mY&UZSWU6E1qJVAa&^R+`qY{+1wKxq&T?yGCA({uVwpx^p<Hbs<~
zAo})w=aC^=Ga>jYIwUwNDLOcT!6^Rc$vRv1z|oIs>Gox<UEV<dee><5k;0wawRK@-
z_fyC!_1iu1!C|pk4$3*tH!20EFnc@S(#9uAT?95SRo3!^B)QZIsDQUtNZi;fZhZBO
z$U0VOMJ63zs??@k`f5U=qT~&zqT+7PJGp^C`L03s?~OEp>^DX_8td}UUoPU+Hc%KG
zK42IJown7wp>NR~N!7En7FT%(qED2-grCcTrq4QLd`8oV;;J<Hg)X&Y%?pC}2IwvF
zB!!<bW%%9}HVPj(?%v3sq&fgxgc+_dmELRkwDU@Yg*NEtNw@IJ7IWqP-riSlI%kpm
zZXWJ(6(-WRTYW<H`Y%m{L*-&M&j!3wwYnsu;(r|OnP6q|<%3n`c47Ftec`dV^W<{^
zWAkU{d#-2yJUQCrIWIu>W@O|}?~3IsWIU(2QlM5DC*SZgGKr>hAIf}ixWE>gk@fMQ
zEca8HD7j?-pm|n8R^w8Uj76Bi+EGt2^VNzw%_j@HmGai-%!DgS)}(TC-UU6qZgF;T
zSX5GU08mC3VOj28LV<A)1^4}2WR96z6{YeLKn9so`(o|nXB>FlwAme)3*H6404JL(
ze`I)l+4}|JFt~Rz6j98w9ErNGMg^Lu@5mX}R-+5qI0Y34hAuUN2h8T#K~rooPi~+}
zWdugp6*FIdm#oCl{_mct0Du5~3p_)nTwNPAFI1-xyIn_vc)hU?=|xdTRR!PgTAM%N
zcmj#c@huUIQ4=~q+1P^Bud$t0Pl)G2GYq0kiQ!l9>cUsh>Dt<kos5%{w-%mUEPsDG
zy3u!ZmpY=UY4TRXq3iKv)0cIS7a(6ZsE9-DYzI{&HIU8?Faw}ap>P0&0<o%{4TAr{
zsl(IUZ_~DDH?^k{vRhm)^;ok!z=dll@^!N2*2W(;7deE*qNVE^^5C$>2wf#Mw_%za
z>fP9AxtdJeEnsiTy3Qxg83uFo`%j}lKK}2Qi{*IxTh<qc)F!x+&Pd#y-JtuiVj(AH
z#`80cE9(LMqFExUaC~CSd2#)FQ!$%7Q1QxKirHDOeY*uHU()?gxm^Wgvf8)1{p$=5
zweOH4Sn_qlFc>pCvR9I4^$>?O6Qkb`>XDgu*O!G2F<vX>tusFkBCVwMissMsTV!*-
zSTDA3(1CXju(~mh!d%jyn#p8b>zQgC3F|!FNBSujH#BO`AkH7fK%SecCZ!1*B38Jy
z#9F_QJ|Ctv?H68gshudOyef4mW3v0Q8RVwUQEri4qzU~2RtPHgWIIv2@11U4$%p8T
z0LjW$$L^5f38v!wfq33YMmI*`MdnMKHM0h48R*pZz{i||KkxO;H}DX-CV<7jT%)Rc
zyDufe$LxYO2Z4HiZ`<P?ZH_V-X1LTU(vn|}mH`*?!N%z1tV|P-Awxr-D5rQQ$Ja2Q
z84(+EFXM`li$+6ABT>5S6>x=uj=jpx&h_j3h)tE%$6{5%4XxTK?Z+u!mO5p^$m<`I
z6Z4Wv3#;BqXk?z6^R<d=pk`^wuD#tP_%&+yU1Uu$Q|J>m(|q_xT>oc5EAsOVXQw{!
zOi8BSIkqtxf3umxLw+_zdO_7)tFYTwyIQTzaVo57-PXJiby?#>hD#VJwZcnmi<sVz
z9i-mCoPeF5-uB}Q$aLSDw{L2|FASd}{J_i0e*c4~9`1jI<#l70ad=k`(NVsN{kvSG
z$%E-z8Rdp<xbG|-0utxPj@3{pL^CEo2S@phO+}$kb<@m~TN;@f9SgX6o-_L|o_EGe
zc8r|)V~<+&qw{q3`7ZonJf^1BVAtwlH#}~crNZ2Q2(NJWU=qx~jdZ)~qHr^>FuH{I
z`u*t9Mgh9zkS-pYpGkt;ev=QTu}$^QOm}z|5p9m##XHPZPpHcaakF7NO=l_(Xsw!O
zt-N{`lwT`k*(JF~uiefY3jZh~f#-~^_VoH*^oYA|%lx9W)a3r&9ga`KA#t@^1MU$i
z1WAMIWZgs+l(W)nSkjwgFGZDPTk;i6bED-xJA|7K=Vc&|90yp3Ezk3>S^G7DAl5%e
zkQ$h3>(80fLW*-KW1jtE^z*pq>UhQExTiEpU=|6SlnrTXV5UjU@qT?TLo7T&!pP=B
zP}DJ2U;cm&%5UUB%Z)u132Y7v0#!T2%!+)cxkp99rdD8=amuR}ms{&I(Q;J%R5vtt
z{Sp<GixDoVoAYC2RWOGpz?D<t)`h5(WIzu76yP2;Kn)H6odp2er~uP|Aj*dtJ>9>g
zKvuv%(pRfN-1XLT7;v`jELe|E+1;ctz0$bUIr$Lpz-aEPabdn-flh1hVrSr8(lG19
z>jWk*|2W`TY!A$}^!Df?i~i%Zhx+aYl}MDG>{#!|YN`a+<ZH1*yl?K&M{Bm})1S78
zY5lR=PvRSOrP`fcV-?aR`{#!@g~7WFo?1(8d$kOj+SV<|CiNw7#a3HcUCNmD6sGct
z71um3#j$dUac6I5u}0q+B<cUb^BY=v4er=r#GpKP7>tV(Qm}L$e&Rz&!9ADLRjE99
zoWyQSN^)!ostnye7$3{wz4iIPY1U67_~wmv^#(4vm(`9|X#LDO9<FNVh@`~^hxV-P
zB-vVqY0xtMBx(E3PC#qTOM+ozQPjD`HcYZ?nEuORUpK3A)m53S4rdv*{9{W=;}zpg
z`QhZgAB<hH8HW$baL=6t3algm2Jg1!y6x|5399&3cTQildE;E3_YG^&{iyC?beRKJ
z;*au9?|3PT1<T9L+joQ{<L>9Jyo9qn+u9H-;{85VH$NHM<71GjwwR-nMhJiftZsq>
z9%A~+VH?Nk6IASuj4GSveKK*w>U{NqbA#{BOEPGg&?Of-tvPvqc0`3ZBp>cZ8VQdz
zOSz3ZdW{l~X)h!rry;s&r>1=EhXX>9SOtaU<hL-a`-ZxV!2I}8)F^sdICaZCLFZLU
zv7m)$bCu`lffKGvka1g}55YPzHG8MObryKC7MN`8s3t_%b5g{TLA4VORbml`^NG2F
z%+hI!B+jNpJz4+fP6f^t243a3ewwRm>|>?;J|tMXwe8?NJD6$@>Y{psN1Is381t?0
zpHv+D@4?UPO=LI41V{VoE?tl!y3N}vUOUnE8V>IvLej=Q3lU0R0~qh=iT4f$qlKSx
zC+Jzl7^#+rc3*84@GzG)*h1{LkgppzJ_BaFKYss#88qP%7cBPtBme&7Jk5HmPo|H(
zgFot<*1bit!BLi3nuL1cAf#m~XCcCui}Rkqb5Rbr5uwH6zzooWZ>a^}S^W;TP0-nE
zjN4l>b#<w_5!EG!9-q+@2zolWmy=iOP*FCJv&B8bH&#5IIW$zV-ZI~HC3KfHx{E7Q
zi-D4whU>VLJ;w&sepuefGu9Ive{cNdxSW$&jh<5nnL|a(sOU0*Jq%4J&Gb;1ngxE4
z>}HgFM8&WCVM#8wzvbr=Q*F)H)`}DBWpUigmjfEHAwDYUH3B!k7L-PK31YZR90w$C
zrMovx?{H5ospi&~{a6dtGE@XFuS6%mO^eR|C{Y{N_hqDpFd2TMg!W*?a#Y6RIkI(n
z0sHysept7(ihC}isgTKOX&=KgVv-lGCs2Sh>AU3kEkG&9Iy=TJ<WnYL<Q#{Wcd_A@
z)hy!#xh?*y7M;UgSF>7d-5VxoEn#9Ln=HqA3-SZiukW4@ALt9|Ui2)n1=DG;klP1l
zaL2N%{x=Voc2&RBTkiPk-iGA?F;sVX;@;2Aa+ZKgj7!trTU&q2w6g2=grdw~Ny^r3
ztu;0pgM(TN{r*Xh1A0z`Jy4+nS{no^`c&CP2Zg)yVRaA0mtMl3X~c-nft7P3PG6Xb
zIS7`2@$_4pV=c01#PQ)O$HEsAMAhD2`^R0voP8~IF13J>u$3j_F5BWeAE~Kkr}eUL
zdMY={0xzSA&zWypZwtoBk;PS&U*&UFt2fkg8zw$*tm6=5IyHTa$RMxZ8JHA+u#K)S
zzHqp-{`d%0s(1oXo$Q(A<&mbj4w@(dQuN1zYpoxdMfBz!Pe#@7hzE`hz%K$H*iJRu
zHU=Z+lltFFgAZeGjk&2+pIeyjiWI#k;MsNyrxuo;Vxp}ictvR?H}Lhi_mWkhDE~05
z-g9V;F!FKOzNqVB{52m$3aBNOSWiomvcqU#g1_ME55^v@DoHCD{@A;Me2}wGKMk5_
zozIs({h?X(wF9;!iOzt|+}l=1z2>ugt6I`W`FUWn=yGBkxP>Rw7RcHbY$SbF>?M`9
lFlD3v_kI8Wo(6Ac!AU5`DQv`9_Fq5pbgmepD>SS_{s$(IL$m+@

literal 0
HcmV?d00001