addming missing file, show softkeyborad on pin activity and change name activity

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 68def42..0372a96 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\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
+    android:versionName="0.1.154B" 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
 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r


@@ -32,6 +32,8 @@
     <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
     <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

+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />\r
+    <uses-permission android:name="android.permission.READ_LOGS" />\r

 \r
     <uses-sdk\r
         android:minSdkVersion="8"\r
 \r
     <uses-sdk\r
         android:minSdkVersion="8"\r


@@ -45,8 +47,7 @@
     <application\r
         android:icon="@drawable/icon"\r
         android:label="@string/app_name"\r
     <application\r
         android:icon="@drawable/icon"\r
         android:label="@string/app_name"\r

-        android:theme="@style/Theme.ownCloud"\r
-        android:uiOptions="splitActionBarWhenNarrow"> \r
+        android:theme="@style/Theme.ownCloud"> \r

         <activity\r
             android:name=".ui.activity.FileDisplayActivity"\r
             android:label="@string/app_name">\r
         <activity\r
             android:name=".ui.activity.FileDisplayActivity"\r
             android:label="@string/app_name">\r


@@ -123,7 +124,7 @@
             android:theme="@style/Theme.ownCloud.noActionBar" >\r
         </activity>\r
 \r
             android:theme="@style/Theme.ownCloud.noActionBar" >\r
         </activity>\r
 \r

-        <service android:name=".FileDownloader" >\r
+        <service android:name=".files.services.FileDownloader" >\r

         </service>\r
         <service android:name=".location.LocationUpdateService" >\r
             <intent-filter>\r
         </service>\r
         <service android:name=".location.LocationUpdateService" >\r
             <intent-filter>\r


@@ -140,15 +141,24 @@
             </intent-filter>\r
         </receiver>\r
 \r
             </intent-filter>\r
         </receiver>\r
 \r

-        <activity\r
-            android:name=".ui.activity.FileDetailActivity"\r
-            android:theme="@style/Theme.ownCloud" >\r
-        </activity>
+        <activity android:name=".ui.activity.FileDetailActivity" />
+        <activity android:name=".ui.activity.PinCodeActivity" />\r

         <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
         <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
+        </service>
+        <service android:name=".files.services.InstantUploadService" />
+        <receiver android:name=".files.PhotoTakenBroadcastReceiver">\r
+            <intent-filter>\r
+                <action android:name="com.android.camera.NEW_PICTURE" />\r
+                <data android:mimeType="image/*" />\r
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
+            </intent-filter>\r
+        </receiver>
+        <activity android:name="CrashlogSendActivity"></activity>\r

     </application>\r
 \r
     </application>\r
 \r

-</manifest>
\ No newline at end of file
+</manifest>