From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 27 Nov 2015 16:49:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/removeRadiosInMigration' into beta
X-Git-Tag: beta-20151128~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/16f21025318f8dc55945638893020977d443218b?hp=b277d52ab693c57d2f74c2063e8b3f6afa36c356

Merge remote-tracking branch 'remotes/upstream/removeRadiosInMigration' into beta
---

diff --git a/src/com/owncloud/android/ui/activity/LocalDirectorySelectorActivity.java b/src/com/owncloud/android/ui/activity/LocalDirectorySelectorActivity.java
index 83b44c59..ad75ab8c 100644
--- a/src/com/owncloud/android/ui/activity/LocalDirectorySelectorActivity.java
+++ b/src/com/owncloud/android/ui/activity/LocalDirectorySelectorActivity.java
@@ -35,6 +35,8 @@ public class LocalDirectorySelectorActivity extends UploadFilesActivity {
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		mUploadBtn.setText(R.string.folder_picker_choose_button_text);
+		mRadioBtnCopyFiles.setVisibility(View.GONE);
+		mRadioBtnMoveFiles.setVisibility(View.GONE);
 	}
 
 	@Override
diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
index d6665e2b..1c5b9f79 100644
--- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@ -81,8 +81,8 @@ public class UploadFilesActivity extends FileActivity implements
     private static final String TAG = "UploadFilesActivity";
     private static final String WAIT_DIALOG_TAG = "WAIT";
     private static final String QUERY_TO_MOVE_DIALOG_TAG = "QUERY_TO_MOVE";
-    private RadioButton mRadioBtnCopyFiles;
-    private RadioButton mRadioBtnMoveFiles;
+    protected RadioButton mRadioBtnCopyFiles;
+    protected RadioButton mRadioBtnMoveFiles;
 
 
     @Override