From 8f2e240c4ec32244e13b99da4bd81ee5e2323a1e Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Sun, 4 Mar 2012 23:16:55 +0400
Subject: [PATCH] Changes

---
 calculatorpp-main/AndroidManifest.xml               |  4 ++--
 calculatorpp-main/src/misc/env/env.properties       |  1 -
 calculatorpp-main/src/misc/env/jarsigner.properties |  0
 pom.xml                                             | 11 +++++++----
 4 files changed, 9 insertions(+), 7 deletions(-)
 delete mode 100644 calculatorpp-main/src/misc/env/env.properties
 delete mode 100644 calculatorpp-main/src/misc/env/jarsigner.properties

diff --git a/calculatorpp-main/AndroidManifest.xml b/calculatorpp-main/AndroidManifest.xml
index e48aec5a..7bbb28c8 100644
--- a/calculatorpp-main/AndroidManifest.xml
+++ b/calculatorpp-main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="33" android:versionName="1.1.4" package="org.solovyev.android.calculator">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="34" android:versionName="1.1.4" package="org.solovyev.android.calculator">
 
 	<uses-permission android:name="android.permission.VIBRATE"/>
 	<uses-permission android:name="android.permission.INTERNET"/>
@@ -8,7 +8,7 @@
 
 	<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8"/>
 
-	<application android:debuggable="true" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication">
+	<application android:debuggable="false" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication">
 
 		<activity android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan">
 
diff --git a/calculatorpp-main/src/misc/env/env.properties b/calculatorpp-main/src/misc/env/env.properties
deleted file mode 100644
index bed508d4..00000000
--- a/calculatorpp-main/src/misc/env/env.properties
+++ /dev/null
@@ -1 +0,0 @@
-android.sdk.path=/home/serso/projects/java/misc/libs/android-sdk-linux_x86
\ No newline at end of file
diff --git a/calculatorpp-main/src/misc/env/jarsigner.properties b/calculatorpp-main/src/misc/env/jarsigner.properties
deleted file mode 100644
index e69de29b..00000000
diff --git a/pom.xml b/pom.xml
index ad6b5812..969e772e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <version>1.1.4</version>
 
     <modules>
-        <module>../android_common</module>
+        <module>../common</module>
         <module>calculatorpp-main</module>
         <module>calculatorpp-test</module>
     </modules>
@@ -68,7 +68,7 @@
                             <platform>15</platform>
                         </sdk>
 
-<!--                        <emulator>
+                        <!--                        <emulator>
                             <avd>23</avd>
                             <wait>10000</wait>
                             &lt;!&ndash;<options>-no-skin</options>&ndash;&gt;
@@ -101,15 +101,18 @@
     </build>
 
     <profiles>
+
         <profile>
             <!-- the standard profile runs the instrumentation tests -->
             <id>standard</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
+
         </profile>
+
         <profile>
-            <!-- the release profile does sign, proguard, zipalign ... but does not run instrumentation tests -->
+            <!-- the release profile does sign, proguard, zipalign  -->
             <id>release</id>
             <!-- via this activation the profile is automatically used when the release is done with the maven release
             plugin -->
@@ -119,9 +122,9 @@
                     <value>true</value>
                 </property>
             </activation>
+
         </profile>
     </profiles>
 
 
-
 </project>
\ No newline at end of file