Merge branch 'develop' into loggingtool

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a6f4b5b..4570ea1 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -19,8 +19,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="103020"
-    android:versionName="1.3.20" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="104000"
+    android:versionName="1.4.0" 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" />


@@ -35,7 +35,8 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

-
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    

     <uses-sdk
         android:minSdkVersion="8"
         android:targetSdkVersion="13" />
     <uses-sdk
         android:minSdkVersion="8"
         android:targetSdkVersion="13" />


@@ -60,6 +61,7 @@
         </activity>
                <activity android:name=".ui.activity.InstantUploadActivity">
         </activity>
         </activity>
                <activity android:name=".ui.activity.InstantUploadActivity">
         </activity>

+        <activity android:name=".ui.activity.FailedUploadActivity" android:theme="@android:style/Theme.Dialog" android:excludeFromRecents="true"/>

         <activity android:name=".Uploader" >
             <intent-filter>
                 <action android:name="android.intent.action.SEND" >
         <activity android:name=".Uploader" >
             <intent-filter>
                 <action android:name="android.intent.action.SEND" >


@@ -88,6 +90,13 @@
         </activity>
         <activity android:name=".ui.activity.PreferencesNewSessionewSession" >
         </activity>
         </activity>
         <activity android:name=".ui.activity.PreferencesNewSessionewSession" >
         </activity>

+        
+               <activity       android:name="com.owncloud.android.ui.preview.PreviewImageActivity" />
+                       
+        <activity      android:name="com.owncloud.android.ui.preview.PreviewVideoActivity"
+                                       android:label="@string/app_name"
+                                       android:theme="@android:style/Theme.NoTitleBar.Fullscreen" >
+               </activity>        

 
         <service
             android:name=".authenticator.AccountAuthenticatorService"
 
         <service
             android:name=".authenticator.AccountAuthenticatorService"


@@ -131,9 +140,10 @@
             </intent-filter>
         </activity>
 
             </intent-filter>
         </activity>
 

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

         <activity android:name=".ui.activity.FileDetailActivity" />
         <activity android:name=".ui.activity.PinCodeActivity" />
         <activity android:name=".extensions.ExtensionsAvailableActivity"></activity>
         <activity android:name=".ui.activity.FileDetailActivity" />
         <activity android:name=".ui.activity.PinCodeActivity" />
         <activity android:name=".extensions.ExtensionsAvailableActivity"></activity>


@@ -142,10 +152,9 @@
         <activity android:name=".ui.activity.ConflictsResolveActivity"/>
         <activity android:name=".ui.activity.GenericExplanationActivity"/>
         <activity android:name=".ui.activity.ErrorsWhileCopyingHandlerActivity"/>
         <activity android:name=".ui.activity.ConflictsResolveActivity"/>
         <activity android:name=".ui.activity.GenericExplanationActivity"/>
         <activity android:name=".ui.activity.ErrorsWhileCopyingHandlerActivity"/>

+        

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

-        <service android:name=".files.services.FileUploader" >
-        </service>

         <service android:name=".files.services.InstantUploadService" />
         <receiver android:name=".files.InstantUploadBroadcastReceiver">
             <intent-filter>
         <service android:name=".files.services.InstantUploadService" />
         <receiver android:name=".files.InstantUploadBroadcastReceiver">
             <intent-filter>


@@ -163,5 +172,5 @@
         </receiver>
         <service android:name=".files.services.FileObserverService"/>
     </application>
         </receiver>
         <service android:name=".files.services.FileObserverService"/>
     </application>

-
+    

 </manifest>
 </manifest>