Fixed navigation behaviour: HomeAsUp takes you up a dir

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 493cbfe..68def42 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>\r
+<!-- \r
+  ownCloud Android client application\r
+\r
+  Copyright (C) 2012  Bartek Przybylski\r
+  This program is free software: you can redistribute it and/or modify\r
+  it under the terms of the GNU General Public License as published by\r
+  the Free Software Foundation, either version 3 of the License, or\r
+  (at your option) any later version.\r
+\r
+  This program is distributed in the hope that it will be useful,\r
+  but WITHOUT ANY WARRANTY; without even the implied warranty of\r
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\r
+  GNU General Public License for more details.\r
+\r
+  You should have received a copy of the GNU General Public License\r
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.\r
+ -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r
     android:versionName="1.0" xmlns:android="http://schemas.android.com/apk/res/android">\r
@@ -12,9 +29,12 @@
     <uses-permission android:name="android.permission.READ_SYNC_STATS" />\r
     <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />\r
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />\r
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />\r
+    <uses-permission android:name="android.permission.BROADCAST_STICKY" />\r
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />\r
 \r
     <uses-sdk\r
-        android:minSdkVersion="7"\r
+        android:minSdkVersion="8"\r
         android:targetSdkVersion="13" />\r
 \r
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" >\r
@@ -24,11 +44,17 @@
 \r
     <application\r
         android:icon="@drawable/icon"\r
-        android:label="@string/app_name" >\r
+        android:label="@string/app_name"\r
+        android:theme="@style/Theme.ownCloud"\r
+        android:uiOptions="splitActionBarWhenNarrow"> \r
         <activity\r
             android:name=".ui.activity.FileDisplayActivity"\r
-            android:label="@string/app_name"\r
-            android:theme="@style/Theme.ownCloud" >\r
+            android:label="@string/app_name">\r
+            <intent-filter>\r
+                <action android:name="android.intent.action.MAIN" />\r
+\r
+                <category android:name="android.intent.category.LAUNCHER" />\r
+            </intent-filter>\r
         </activity>\r
         <activity android:name=".Uploader" >\r
             <intent-filter>\r
@@ -52,15 +78,16 @@
                 </data>\r
             </intent-filter>\r
         </activity>\r
-        <activity android:name=".ui.activity.Preferences" \r
-            android:theme="@style/Theme.ownCloud">\r
+        <activity\r
+            android:name=".ui.activity.Preferences"\r
+            android:theme="@style/Theme.ownCloud" >\r
         </activity>\r
         <activity android:name=".ui.activity.PreferencesNewSessionewSession" >\r
         </activity>\r
 \r
         <service\r
             android:name=".authenticator.AccountAuthenticatorService"\r
-            android:exported="true" >\r
+            android:exported="true">\r
             <intent-filter>\r
                 <action android:name="android.accounts.AccountAuthenticator" />\r
             </intent-filter>\r
@@ -80,21 +107,6 @@
                 android:name="android.content.SyncAdapter"\r
                 android:resource="@xml/syncadapter_files" />\r
         </service>\r
-        <service\r
-            android:name=".syncadapter.ContactSyncService"\r
-            android:exported="true"\r
-            android:process=":contacts" >\r
-            <intent-filter>\r
-                <action android:name="android.content.SyncAdapter" />\r
-            </intent-filter>\r
-\r
-            <meta-data\r
-                android:name="android.content.SyncAdapter"\r
-                android:resource="@xml/syncadapter_contacts" />\r
-            <meta-data\r
-                android:name="android.provider.CONTACTS_STRUCTURE"\r
-                android:resource="@xml/contacts" />\r
-        </service>\r
 \r
         <provider\r
             android:name=".providers.FileContentProvider"\r
@@ -108,24 +120,35 @@
         <activity\r
             android:name=".ui.activity.AuthenticatorActivity"\r
             android:exported="true"\r
-            android:theme="@style/Theme.ownCloud" >\r
+            android:theme="@style/Theme.ownCloud.noActionBar" >\r
         </activity>\r
 \r
         <service android:name=".FileDownloader" >\r
         </service>\r
+        <service android:name=".location.LocationUpdateService" >\r
+            <intent-filter>\r
+                <action android:name="eu.alefzero.owncloud.location.LocationUpdateService" />\r
+            </intent-filter>\r
+        </service>\r
 \r
-        <activity android:name=".ui.activity.FileDetailActivity" >\r
-        </activity>\r
-        <activity\r
-            android:name=".ui.activity.LandingActivity"\r
-            android:label="@string/app_name"\r
-            android:theme="@style/Theme.ownCloud" >\r
+        <receiver android:name=".location.LocationServiceLauncherReciever" >\r
             <intent-filter>\r
-                <action android:name="android.intent.action.MAIN" />\r
+                <action android:name="android.intent.action.BOOT_COMPLETED" />\r
+                <action android:name="eu.alefzero.owncloud.location.LocationLauncher" />\r
 \r
-                <category android:name="android.intent.category.LAUNCHER" />\r
+                <category android:name="android.intent.category.HOME" />\r
             </intent-filter>\r
-        </activity>\r
+        </receiver>\r
+\r
+        <activity\r
+            android:name=".ui.activity.FileDetailActivity"\r
+            android:theme="@style/Theme.ownCloud" >\r
+        </activity>
+        <activity android:name=".extensions.ExtensionsAvailableActivity"></activity>
+        <activity android:name=".extensions.ExtensionsListActivity"></activity>\r
+        <activity android:name=".ui.activity.AccountSelectActivity" android:uiOptions="none" android:label="@string/prefs_accounts"></activity>\r
+        <service android:name=".files.services.FileUploader" >\r
+        </service>\r
     </application>\r
 \r
 </manifest>
\ No newline at end of file