adjusting design to holo, stability for account setup

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ce11179..39d9085 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>\r
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"\r
-    package="eu.alefzero.owncloud"\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" >\r
+    android:versionName="1.0" xmlns:android="http://schemas.android.com/apk/res/android">\r
 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r
@@ -15,6 +31,7 @@
     <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="8"\r
@@ -27,11 +44,12 @@
 \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
@@ -69,7 +87,7 @@
 \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
@@ -102,7 +120,7 @@
         <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
@@ -125,7 +143,10 @@
         <activity\r
             android:name=".ui.activity.FileDetailActivity"\r
             android:theme="@style/Theme.ownCloud" >\r
-        </activity>\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
     </application>\r
 \r
 </manifest>
\ No newline at end of file