From a9126f72142468397a061ebff426c1233dded7fc Mon Sep 17 00:00:00 2001
From: kLeZ <julius8774@gmail.com>
Date: Tue, 23 Sep 2014 09:58:05 +0200
Subject: Some other Eclipse integration, modified AndroidManifest.xml to match
 build.gradle information (app version, sdk version)

---
 app/copyLibs.gradle              |  4 +-
 app/src/main/AndroidManifest.xml | 86 ++++++++++++++++++----------------------
 2 files changed, 40 insertions(+), 50 deletions(-)

(limited to 'app')

diff --git a/app/copyLibs.gradle b/app/copyLibs.gradle
index a8555cb0..d0fa5f8e 100644
--- a/app/copyLibs.gradle
+++ b/app/copyLibs.gradle
@@ -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(
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 815febe3..b42dd278 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,52 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.zeapo.pwdstore" >
-
-    <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"
-            android:parentActivityName=".PasswordStore">
-            <meta-data
-                android:name="android.PARENT_ACTIVITY1"
-                android:value="com.zeapo.pwdstore.PasswordStore" />
-        </activity>
-        <activity android:name=".crypto.OpenPgpProviderActivity" />
-
-        <activity android:name=".UserPreference"
-            android:parentActivityName=".PasswordStore">
-
-            <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"
-            android:parentActivityName=".PasswordStore">
-
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.zeapo.pwdstore.PasswordStore" />
-        </activity>
-    </application>
-
-    <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" />
+	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">
+			<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"
+			android:parentActivityName=".PasswordStore">
+			<meta-data android:name="android.PARENT_ACTIVITY1"
+				android:value="com.zeapo.pwdstore.PasswordStore" />
+		</activity>
+		<activity android:name=".crypto.OpenPgpProviderActivity" />
+
+		<activity android:name=".UserPreference"
+			android:parentActivityName=".PasswordStore">
+
+			<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"
+			android:parentActivityName=".PasswordStore">
+
+			<meta-data android:name="android.support.PARENT_ACTIVITY"
+				android:value="com.zeapo.pwdstore.PasswordStore" />
+		</activity>
+	</application>
+
+	<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>
-- 
cgit v1.2.3