This commit is contained in:
Sergey Solovyev 2012-03-04 23:16:55 +04:00
parent bcb07a5522
commit 8f2e240c4e
4 changed files with 9 additions and 7 deletions

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?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.VIBRATE"/>
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>
@ -8,7 +8,7 @@
<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8"/> <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"> <activity android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan">

View File

@ -1 +0,0 @@
android.sdk.path=/home/serso/projects/java/misc/libs/android-sdk-linux_x86

11
pom.xml
View File

@ -11,7 +11,7 @@
<version>1.1.4</version> <version>1.1.4</version>
<modules> <modules>
<module>../android_common</module> <module>../common</module>
<module>calculatorpp-main</module> <module>calculatorpp-main</module>
<module>calculatorpp-test</module> <module>calculatorpp-test</module>
</modules> </modules>
@ -68,7 +68,7 @@
<platform>15</platform> <platform>15</platform>
</sdk> </sdk>
<!-- <emulator> <!-- <emulator>
<avd>23</avd> <avd>23</avd>
<wait>10000</wait> <wait>10000</wait>
&lt;!&ndash;<options>-no-skin</options>&ndash;&gt; &lt;!&ndash;<options>-no-skin</options>&ndash;&gt;
@ -101,15 +101,18 @@
</build> </build>
<profiles> <profiles>
<profile> <profile>
<!-- the standard profile runs the instrumentation tests --> <!-- the standard profile runs the instrumentation tests -->
<id>standard</id> <id>standard</id>
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
</profile> </profile>
<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> <id>release</id>
<!-- via this activation the profile is automatically used when the release is done with the maven release <!-- via this activation the profile is automatically used when the release is done with the maven release
plugin --> plugin -->
@ -119,9 +122,9 @@
<value>true</value> <value>true</value>
</property> </property>
</activation> </activation>
</profile> </profile>
</profiles> </profiles>
</project> </project>