[tx-robot] updated from transifex

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 141d56a..242586a 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="10500800"
+    android:versionName="1.5.8" 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" />


@@ -59,9 +59,6 @@
         </activity>
         <activity android:name=".ui.activity.UploadFilesActivity">
         </activity>
         </activity>
         <activity android:name=".ui.activity.UploadFilesActivity">
         </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=".ui.activity.Uploader" >
             <intent-filter>
                 <action android:name="android.intent.action.SEND" >
         <activity android:name=".ui.activity.Uploader" >
             <intent-filter>
                 <action android:name="android.intent.action.SEND" >


@@ -80,12 +77,10 @@
                 <category android:name="android.intent.category.DEFAULT" >
                 </category>
 
                 <category android:name="android.intent.category.DEFAULT" >
                 </category>
 

-                <data android:mimeType="*/*" android:scheme="content">
+                <data android:mimeType="*/*" >

                 </data>
 
                 </data>
 

-                <data android:mimeType="*/*" android:scheme="file">
-                </data>
-                </intent-filter>
+                       </intent-filter>

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


@@ -94,11 +89,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


@@ -157,7 +156,6 @@
         <service android:name=".media.MediaService" />
         
         <activity android:name=".ui.activity.PinCodeActivity" />
         <service android:name=".media.MediaService" />
         
         <activity android:name=".ui.activity.PinCodeActivity" />

-        <activity android:name=".ui.activity.AccountSelectActivity" android:uiOptions="none" android:label="@string/prefs_accounts"></activity>

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


@@ -173,6 +171,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>


@@ -181,7 +183,12 @@
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>
                 <action android:name="android.intent.action.BOOT_COMPLETED"/>
             </intent-filter>
         </receiver>

-        <service android:name=".files.services.FileObserverService"/>
+        <service android:name=".services.observer.FileObserverService"/>
+        
+        <activity 
+            android:name=".ui.activity.CopyToClipboardActivity" 
+               android:label="@string/copy_link"
+               android:icon="@drawable/copy_link" />

         
     </application>
 
         
     </application>