Add mCursor to FileListListAdapter

[pub/Android/ownCloud.git] / AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b107527..48d5b0c 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,7 +3,7 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski

-  Copyright (C) 2012-2013 ownCloud Inc.
+  Copyright (C) 2012-2014 ownCloud Inc.

 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,


@@ -18,8 +18,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
  -->
 <manifest package="com.owncloud.android"

-    android:versionCode="104006"
-    android:versionName="1.4.6" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="105005"
+    android:versionName="1.5.5" xmlns:android="http://schemas.android.com/apk/res/android">

 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />


@@ -54,7 +54,6 @@
             >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

-

                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>


@@ -83,7 +82,8 @@
 
                 <data android:mimeType="*/*" >
                 </data>
 
                 <data android:mimeType="*/*" >
                 </data>

-            </intent-filter>
+
+                       </intent-filter>

         </activity>
         <activity
             android:name=".ui.activity.Preferences"
         </activity>
         <activity
             android:name=".ui.activity.Preferences"


@@ -92,11 +92,15 @@
         <activity android:name=".ui.activity.PreferencesNewSessionewSession" >
         </activity>
         
         <activity android:name=".ui.activity.PreferencesNewSessionewSession" >
         </activity>
         

-        <activity      android:name=".ui.preview.PreviewImageActivity" />
+        <activity      
+            android:name=".ui.preview.PreviewImageActivity" 
+            />

                        
                        

-        <activity      android:name=".ui.preview.PreviewVideoActivity"
-                                       android:label="@string/app_name"
-                                       android:theme="@style/Theme.ownCloud.Fullscreen" >
+        <activity      
+            android:name=".ui.preview.PreviewVideoActivity"
+                       android:label="@string/app_name"
+                       android:theme="@style/Theme.ownCloud.Fullscreen" 
+                       >

                </activity>        
 
         <service
                </activity>        
 
         <service


@@ -113,7 +117,7 @@
         <service
             android:name=".syncadapter.FileSyncService"
             android:exported="true" 
         <service
             android:name=".syncadapter.FileSyncService"
             android:exported="true" 

-            android:process=":sync">
+            >

             <intent-filter>
                 <action android:name="android.content.SyncAdapter" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.content.SyncAdapter" />
             </intent-filter>


@@ -149,6 +153,7 @@
             </intent-filter>
         </activity>
 
             </intent-filter>
         </activity>
 

+        <service android:name=".services.OperationsService" />

         <service android:name=".files.services.FileDownloader" />
         <service android:name=".files.services.FileUploader" />
         <service android:name=".media.MediaService" />
         <service android:name=".files.services.FileDownloader" />
         <service android:name=".files.services.FileUploader" />
         <service android:name=".media.MediaService" />


@@ -170,6 +175,10 @@
                 <data android:mimeType="image/*" />
             </intent-filter>
             <intent-filter>
                 <data android:mimeType="image/*" />
             </intent-filter>
             <intent-filter>

+                <action android:name="android.hardware.action.NEW_VIDEO" />
+                <data android:mimeType="video/*" />
+            </intent-filter>
+            <intent-filter>

                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
             </intent-filter>
         </receiver>
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
             </intent-filter>
         </receiver>


@@ -180,6 +189,11 @@
         </receiver>
         <service android:name=".files.services.FileObserverService"/>
         
         </receiver>
         <service android:name=".files.services.FileObserverService"/>
         

+        <activity 
+            android:name=".ui.activity.CopyToClipboardActivity" 
+               android:label="@string/copy_link"
+               android:icon="@drawable/copy_link" />
+        

     </application>
 
 </manifest>
     </application>
 
 </manifest>