Add mCursor to FileListListAdapter

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8700e58..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="105004"
-    android:versionName="1.5.4" 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" />


@@ -51,7 +51,7 @@
         <activity
             android:name=".ui.activity.FileDisplayActivity"
             android:label="@string/app_name"
         <activity
             android:name=".ui.activity.FileDisplayActivity"
             android:label="@string/app_name"

-            android:configChanges="orientation" >
+            >

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


@@ -94,13 +94,13 @@
         
         <activity      
             android:name=".ui.preview.PreviewImageActivity" 
         
         <activity      
             android:name=".ui.preview.PreviewImageActivity" 

-            android:configChanges="orientation" />
+            />

                        
         <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" 

-                       android:configChanges="orientation">
+                       >

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


@@ -175,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>