From: David A. Velasco <dvelasco@owncloud.com>
Date: Wed, 26 Nov 2014 12:10:04 +0000 (+0100)
Subject: Merge pull request #752 from owncloud/instant_uploads_set_path
X-Git-Tag: oc-android-1.7.0_signed~15^2~5^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/44c0d86ede0e79f42528ee60445dea1493bb0e16?hp=-c

Merge pull request #752 from owncloud/instant_uploads_set_path

Better UI for settings path of instant uploads
---

44c0d86ede0e79f42528ee60445dea1493bb0e16
diff --combined AndroidManifest.xml
index fe9bc106,ca5aec0a..fd92d3d6
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@@ -18,8 -18,8 +18,8 @@@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
  <manifest package="com.owncloud.android"
 -    android:versionCode="10600100"
 -    android:versionName="1.6.1" xmlns:android="http://schemas.android.com/apk/res/android">
 +    android:versionCode="10600200"
 +    android:versionName="1.6.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" />
@@@ -191,7 -191,11 +191,11 @@@
  			android:icon="@drawable/copy_link"/>
  
          <activity 
- 			android:name=".ui.activity.MoveActivity"
+ 			android:name=".ui.activity.FolderPickerActivity"
+ 			android:label="@string/app_name"/>
+ 
+         <activity 
+ 			android:name=".ui.activity.UploadPathActivity"
  			android:label="@string/app_name"/>
          
      </application>