kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some other Eclipse integration, modified AndroidManifest.xml to match build.gradle information (app version, sdk version)

Browse source
This commit is contained in:
kLeZ 2014-09-23 09:58:05 +02:00
parent cac3e8e71c
commit a9126f7214
2 changed files with 33 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/copyLibs.gradle
View file

@ -67,7 +67,7 @@ task ('copyJarDependenciesIntoLibs', type: CopyJars) {
description = 'Used for Eclipse. Copies JAR dependencies to the libs directory.'
destination = file(project.projectDir.canonicalPath + File.separator + 'libs')
destination = file(project.projectDir.canonicalPath + File.separator + 'src' + File.separator + 'main' + File.separator + 'libs')
afterEvaluate {
source = files(
@ -87,7 +87,7 @@ task ('extractAarDependenciesIntoLibs', type: ExtractAars) {
description = 'Used for Eclipse. Extracts AAR dependencies into the libs directory.'
destination = file(project.projectDir.canonicalPath + File.separator + 'libs')
destination = file(project.projectDir.canonicalPath + File.separator + 'src' + File.separator + 'main' + File.separator + 'libs')
afterEvaluate {
source = files(

32
app/src/main/AndroidManifest.xml
View file

@ -1,27 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.zeapo.pwdstore" >
package="com.zeapo.pwdstore" android:versionCode="11"
android:versionName="1.1-b5">
<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme" >
<activity
android:name=".PasswordStore"
android:label="@string/app_name" >
<application android:allowBackup="true" android:icon="@drawable/ic_launcher"
android:label="@string/app_name" android:theme="@style/AppTheme">
<activity android:name=".PasswordStore" android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity
android:name=".GitHandler"
android:label="@string/title_activity_git_clone"
<activity android:name=".GitHandler" android:label="@string/title_activity_git_clone"
android:parentActivityName=".PasswordStore">
<meta-data
android:name="android.PARENT_ACTIVITY1"
<meta-data android:name="android.PARENT_ACTIVITY1"
android:value="com.zeapo.pwdstore.PasswordStore" />
</activity>
<activity android:name=".crypto.OpenPgpProviderActivity" />
@ -29,18 +22,14 @@
<activity android:name=".UserPreference"
android:parentActivityName=".PasswordStore">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
<meta-data android:name="android.support.PARENT_ACTIVITY"
android:value="com.zeapo.pwdstore.PasswordStore" />
</activity>
<activity
android:name=".crypto.PgpHandler"
android:label="@string/title_activity_pgp_handler"
<activity android:name=".crypto.PgpHandler" android:label="@string/title_activity_pgp_handler"
android:parentActivityName=".PasswordStore">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
<meta-data android:name="android.support.PARENT_ACTIVITY"
android:value="com.zeapo.pwdstore.PasswordStore" />
</activity>
</application>
@ -48,5 +37,6 @@
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-sdk android:targetSdkVersion="19" android:minSdkVersion="15" />
</manifest>