Merge branch 'develop' into refactor_remote_operation_to_create_folder

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / UploadFilesActivity.java

diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
index ab7bb46..cc1f7de 100644 (file)
--- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@ -29,6 +29,7 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;

+import android.widget.Button;

 import android.widget.TextView;
 
 import com.actionbarsherlock.app.ActionBar;
 import android.widget.TextView;
 
 import com.actionbarsherlock.app.ActionBar;


@@ -36,7 +37,6 @@ import com.actionbarsherlock.app.ActionBar.OnNavigationListener;
 import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
 import com.actionbarsherlock.view.MenuItem;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;

-import com.owncloud.android.ui.CustomButton;

 import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
 import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
 import com.owncloud.android.ui.fragment.LocalFileListFragment;
 import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
 import com.owncloud.android.ui.fragment.ConfirmationDialogFragment;
 import com.owncloud.android.ui.fragment.LocalFileListFragment;


@@ -58,8 +58,8 @@ public class UploadFilesActivity extends FileActivity implements
     private ArrayAdapter<String> mDirectories;
     private File mCurrentDir = null;
     private LocalFileListFragment mFileListFragment;
     private ArrayAdapter<String> mDirectories;
     private File mCurrentDir = null;
     private LocalFileListFragment mFileListFragment;

-    private CustomButton mCancelBtn;
-    private CustomButton mUploadBtn;
+    private Button mCancelBtn;
+    private Button mUploadBtn;

     private Account mAccountOnCreation;
     private DialogFragment mCurrentDialog;
     
     private Account mAccountOnCreation;
     private DialogFragment mCurrentDialog;
     


@@ -103,9 +103,9 @@ public class UploadFilesActivity extends FileActivity implements
         
         
         // Set input controllers
         
         
         // Set input controllers

-        mCancelBtn = (CustomButton) findViewById(R.id.upload_files_btn_cancel);
+        mCancelBtn = (Button) findViewById(R.id.upload_files_btn_cancel);

         mCancelBtn.setOnClickListener(this);
         mCancelBtn.setOnClickListener(this);

-        mUploadBtn = (CustomButton) findViewById(R.id.upload_files_btn_upload);
+        mUploadBtn = (Button) findViewById(R.id.upload_files_btn_upload);

         mUploadBtn.setOnClickListener(this);
         
             
         mUploadBtn.setOnClickListener(this);