X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/c43b15deab02bde6ea9a9e4d8aa6ea1510808423..c2abbaaedb69dba35866a48b745b68f3519cbca1:/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 077c4a4f..ab7bb463 100644 --- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java +++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java @@ -21,7 +21,6 @@ import java.io.File; import android.accounts.Account; import android.content.Intent; -import android.net.Uri; import android.os.AsyncTask; import android.os.Bundle; import android.os.Environment; @@ -30,25 +29,20 @@ import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.ArrayAdapter; -import android.widget.Button; -import android.widget.MediaController; import android.widget.TextView; import com.actionbarsherlock.app.ActionBar; import com.actionbarsherlock.app.ActionBar.OnNavigationListener; -import com.actionbarsherlock.app.SherlockFragmentActivity; import com.actionbarsherlock.view.MenuItem; -import com.owncloud.android.datamodel.FileDataStorageManager; -import com.owncloud.android.datamodel.OCFile; +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.fragment.ConfirmationDialogFragment.ConfirmationDialogFragmentListener; import com.owncloud.android.utils.FileStorageUtils; -import com.owncloud.android.AccountUtils; -import com.owncloud.android.Log_OC; -import com.owncloud.android.R; /** * Displays local files and let the user choose what of them wants to upload @@ -64,8 +58,8 @@ public class UploadFilesActivity extends FileActivity implements private ArrayAdapter mDirectories; private File mCurrentDir = null; private LocalFileListFragment mFileListFragment; - private Button mCancelBtn; - private Button mUploadBtn; + private CustomButton mCancelBtn; + private CustomButton mUploadBtn; private Account mAccountOnCreation; private DialogFragment mCurrentDialog; @@ -109,10 +103,11 @@ public class UploadFilesActivity extends FileActivity implements // Set input controllers - mCancelBtn = (Button) findViewById(R.id.upload_files_btn_cancel); + mCancelBtn = (CustomButton) findViewById(R.id.upload_files_btn_cancel); mCancelBtn.setOnClickListener(this); - mUploadBtn = (Button) findViewById(R.id.upload_files_btn_upload); + mUploadBtn = (CustomButton) findViewById(R.id.upload_files_btn_upload); mUploadBtn.setOnClickListener(this); + // Action bar setup ActionBar actionBar = getSupportActionBar();