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 83b44c5..ad75ab8 100644 (file)
--- 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 d6665e2..1c5b9f7 100644 (file)
--- 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