Create the layout for searching users/groups

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f0d1e9d..acb5f1d 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
+<?xml version="1.0" encoding="utf-8"?><!--

   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski


@@ -18,8 +17,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="10700000"
-    android:versionName="1.7.0" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="10800000"
+    android:versionName="1.8.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" />


@@ -32,75 +31,64 @@
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
     <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
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     
     <uses-sdk

-        android:minSdkVersion="8"
-        android:targetSdkVersion="19" />
+        android:minSdkVersion="14"
+        android:targetSdkVersion="22" />

 
 

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

 
     <application
         android:name=".MainApp"
         android:icon="@drawable/icon"
         android:label="@string/app_name"
 
     <application
         android:name=".MainApp"
         android:icon="@drawable/icon"
         android:label="@string/app_name"

-        android:theme="@style/Theme.ownCloud"> 
+        android:theme="@style/Theme.ownCloud">

         <activity
             android:name=".ui.activity.FileDisplayActivity"
         <activity
             android:name=".ui.activity.FileDisplayActivity"

-            android:label="@string/app_name"
-            >
+            android:label="@string/app_name">

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

-        <activity android:name=".ui.activity.UploadFilesActivity">
-        </activity>
-        <activity android:name=".ui.activity.Uploader" >
+        <activity android:name=".ui.activity.UploadFilesActivity"></activity>
+        <activity android:name=".ui.activity.Uploader">

             <intent-filter>
             <intent-filter>

-                <action android:name="android.intent.action.SEND" >
-                </action>
+                <action android:name="android.intent.action.SEND"></action>

 
 

-                <category android:name="android.intent.category.DEFAULT" >
-                </category>
+                <category android:name="android.intent.category.DEFAULT"></category>

 
 

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

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

-                <action android:name="android.intent.action.SEND_MULTIPLE" >
-                </action>
+                <action android:name="android.intent.action.SEND_MULTIPLE"></action>

 
 

-                <category android:name="android.intent.category.DEFAULT" >
-                </category>
+                <category android:name="android.intent.category.DEFAULT"></category>

 
 

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

 
 

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

         </activity>
         <activity
             android:name=".ui.activity.Preferences"
             android:theme="@style/Theme.ownCloud" >
         </activity>
         <activity      
         </activity>
         <activity
             android:name=".ui.activity.Preferences"
             android:theme="@style/Theme.ownCloud" >
         </activity>
         <activity      

-            android:name=".ui.preview.PreviewImageActivity" 
+            android:name=".ui.preview.PreviewImageActivity"
+            android:theme="@style/Theme.ownCloud.Overlay"

             />
                        
         <activity      
             android:name=".ui.preview.PreviewVideoActivity"
             />
                        
         <activity      
             android:name=".ui.preview.PreviewVideoActivity"

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

 
         <service
             android:name=".authentication.AccountAuthenticatorService"
             android:exported="true">
 
         <service
             android:name=".authentication.AccountAuthenticatorService"
             android:exported="true">

-            <intent-filter  android:priority="100">
+            <intent-filter android:priority="100">

                 <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>
 
                 <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>
 


@@ -110,8 +98,7 @@
         </service>
         <service
             android:name=".syncadapter.FileSyncService"
         </service>
         <service
             android:name=".syncadapter.FileSyncService"

-            android:exported="true" 
-            >
+            android:exported="true">

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


@@ -127,18 +114,19 @@
             android:enabled="true"
             android:exported="false"
             android:label="@string/sync_string_files"
             android:enabled="true"
             android:exported="false"
             android:label="@string/sync_string_files"

-            android:syncable="true" >
-        </provider>
+            android:syncable="true"></provider>

 
         <activity
             android:name=".authentication.AuthenticatorActivity"
             android:exported="true"
 
         <activity
             android:name=".authentication.AuthenticatorActivity"
             android:exported="true"

-            android:theme="@style/Theme.ownCloud.noActionBar" 
+            android:theme="@style/Theme.ownCloud.noActionBar"

             android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
             android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />

+

                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />

+

                 <data android:scheme="@string/oauth2_redirect_scheme" />
             </intent-filter>
             <intent-filter>
                 <data android:scheme="@string/oauth2_redirect_scheme" />
             </intent-filter>
             <intent-filter>


@@ -151,8 +139,8 @@
         <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" />

-        
-        <activity android:name=".ui.activity.PinCodeActivity" />
+
+        <activity android:name=".ui.activity.PassCodeActivity" />

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


@@ -163,7 +151,7 @@
             <intent-filter>
                 <!-- unofficially supported by many Android phones but not by HTC devices: -->
                 <action android:name="com.android.camera.NEW_PICTURE" />
             <intent-filter>
                 <!-- unofficially supported by many Android phones but not by HTC devices: -->
                 <action android:name="com.android.camera.NEW_PICTURE" />

-                <!-- officially supported since Android 4.0 (SDK 14, works even for HTC devices): --> 
+                <!-- officially supported since Android 4.0 (SDK 14, works even for HTC devices): -->

                 <action android:name="android.hardware.action.NEW_PICTURE" />
                 <data android:mimeType="image/*" />
             </intent-filter>
                 <action android:name="android.hardware.action.NEW_PICTURE" />
                 <data android:mimeType="image/*" />
             </intent-filter>


@@ -172,12 +160,12 @@
                 <data android:mimeType="video/*" />
             </intent-filter>
             <intent-filter>
                 <data android:mimeType="video/*" />
             </intent-filter>
             <intent-filter>

-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />

             </intent-filter>
         </receiver>
         <receiver android:name=".files.BootupBroadcastReceiver">
             <intent-filter>
             </intent-filter>
         </receiver>
         <receiver android:name=".files.BootupBroadcastReceiver">
             <intent-filter>

-                <action android:name="android.intent.action.BOOT_COMPLETED"/>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />

             </intent-filter>
         </receiver>
         <service android:name=".services.observer.FileObserverService"/>
             </intent-filter>
         </receiver>
         <service android:name=".services.observer.FileObserverService"/>


@@ -187,11 +175,11 @@
                        android:label="@string/copy_link"
                        android:icon="@drawable/copy_link"/>
 
                        android:label="@string/copy_link"
                        android:icon="@drawable/copy_link"/>
 

-        <activity 
+        <activity

                        android:name=".ui.activity.FolderPickerActivity"
                        android:label="@string/app_name"/>
 
                        android:name=".ui.activity.FolderPickerActivity"
                        android:label="@string/app_name"/>
 

-        <activity 
+        <activity

                        android:name=".ui.activity.UploadPathActivity"
                        android:label="@string/app_name"/>
         
                        android:name=".ui.activity.UploadPathActivity"
                        android:label="@string/app_name"/>