delete values-tzl

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

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f41f2f4..5b9fc71 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -3,7 +3,7 @@
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski
   ownCloud Android client application
 
   Copyright (C) 2012  Bartek Przybylski

-  Copyright (C) 2012-2014 ownCloud Inc.
+  Copyright (C) 2012-2015 ownCloud Inc.

 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,


@@ -18,8 +18,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="105007"
-    android:versionName="1.5.7" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionCode="10700200"
+    android:versionName="1.7.2" 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,12 +32,11 @@
     <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:minSdkVersion="14"

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


@@ -59,9 +58,6 @@
         </activity>
         <activity android:name=".ui.activity.UploadFilesActivity">
         </activity>
         </activity>
         <activity android:name=".ui.activity.UploadFilesActivity">
         </activity>

-               <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=".ui.activity.Uploader" >
             <intent-filter>
                 <action android:name="android.intent.action.SEND" >
         <activity android:name=".ui.activity.Uploader" >
             <intent-filter>
                 <action android:name="android.intent.action.SEND" >


@@ -89,9 +85,6 @@
             android:name=".ui.activity.Preferences"
             android:theme="@style/Theme.ownCloud" >
         </activity>
             android:name=".ui.activity.Preferences"
             android:theme="@style/Theme.ownCloud" >
         </activity>

-        <activity android:name=".ui.activity.PreferencesNewSessionewSession" >
-        </activity>
-        

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


@@ -158,8 +151,7 @@
         <service android:name=".files.services.FileUploader" />
         <service android:name=".media.MediaService" />
         
         <service android:name=".files.services.FileUploader" />
         <service android:name=".media.MediaService" />
         

-        <activity android:name=".ui.activity.PinCodeActivity" />
-        <activity android:name=".ui.activity.AccountSelectActivity" android:uiOptions="none" android:label="@string/prefs_accounts"></activity>
+        <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"/>


@@ -189,10 +181,18 @@
         </receiver>
         <service android:name=".services.observer.FileObserverService"/>
         
         </receiver>
         <service android:name=".services.observer.FileObserverService"/>
         

+               <activity
+                       android:name=".ui.activity.CopyToClipboardActivity"
+                       android:label="@string/copy_link"
+                       android:icon="@drawable/copy_link"/>
+
+        <activity 
+                       android:name=".ui.activity.FolderPickerActivity"
+                       android:label="@string/app_name"/>
+

         <activity 
         <activity 

-            android:name=".ui.activity.CopyToClipboardActivity" 
-               android:label="@string/copy_link"
-               android:icon="@drawable/copy_link" />
+                       android:name=".ui.activity.UploadPathActivity"
+                       android:label="@string/app_name"/>

         
     </application>
 
         
     </application>