Merge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operat...

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 951301e..b107527 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -38,7 +38,7 @@
     
     <uses-sdk
         android:minSdkVersion="8"
-        android:targetSdkVersion="13" />
+        android:targetSdkVersion="19" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" >
     </uses-permission>
@@ -63,7 +63,7 @@
                <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" >
+        <activity android:name=".ui.activity.Uploader" >
             <intent-filter>
                 <action android:name="android.intent.action.SEND" >
                 </action>
@@ -92,9 +92,9 @@
         <activity android:name=".ui.activity.PreferencesNewSessionewSession" >
         </activity>
         
-        <activity      android:name="com.owncloud.android.ui.preview.PreviewImageActivity" />
+        <activity      android:name=".ui.preview.PreviewImageActivity" />
                        
-        <activity      android:name="com.owncloud.android.ui.preview.PreviewVideoActivity"
+        <activity      android:name=".ui.preview.PreviewVideoActivity"
                                        android:label="@string/app_name"
                                        android:theme="@style/Theme.ownCloud.Fullscreen" >
                </activity>        
@@ -112,7 +112,8 @@
         </service>
         <service
             android:name=".syncadapter.FileSyncService"
-            android:exported="true" >
+            android:exported="true" 
+            android:process=":sync">
             <intent-filter>
                 <action android:name="android.content.SyncAdapter" />
             </intent-filter>