Merge branch 'develop' into review_build_process

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

diff --git a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java
index 99b0b83..f0ee721 100644 (file)
--- a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java
+++ b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java
@@ -41,9 +41,9 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.owncloud.android.AccountUtils;
 import com.owncloud.android.Log_OC;
 import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.db.DbHandler;
 import com.owncloud.android.files.InstantUploadBroadcastReceiver;
 import com.owncloud.android.files.services.FileUploader;
@@ -149,7 +149,7 @@ public class InstantUploadActivity extends Activity {
                 loadmoreBtn = new Button(this);
                 loadmoreBtn.setId(42);
                 loadmoreBtn.setText(getString(R.string.failed_upload_load_more_images));
-                loadmoreBtn.setBackgroundResource(R.color.owncloud_white);
+                loadmoreBtn.setBackgroundResource(R.color.background_color);
                 loadmoreBtn.setTextSize(12);
                 loadmoreBtn.setOnClickListener(new OnClickListener() {
                     @Override
@@ -328,14 +328,14 @@ public class InstantUploadActivity extends Activity {
 
         TextView failureTextView = new TextView(this);
         failureTextView.setText(getString(R.string.failed_upload_failure_text) + message);
-        failureTextView.setBackgroundResource(R.color.owncloud_white);
+        failureTextView.setBackgroundResource(R.color.background_color);
         failureTextView.setTextSize(8);
         failureTextView.setOnLongClickListener(getOnLongClickListener(message));
         failureTextView.setPadding(5, 5, 5, 10);
         TextView retryButton = new TextView(this);
         retryButton.setId(id);
         retryButton.setText(img_path);
-        retryButton.setBackgroundResource(R.color.owncloud_white);
+        retryButton.setBackgroundResource(R.color.background_color);
         retryButton.setTextSize(8);
         retryButton.setOnClickListener(getImageButtonOnClickListener(img_path));
         retryButton.setOnLongClickListener(getOnLongClickListener(message));
@@ -365,7 +365,7 @@ public class InstantUploadActivity extends Activity {
     private CheckBox getFileCheckbox(int id) {
         CheckBox retryCB = new CheckBox(this);
         retryCB.setId(id);
-        retryCB.setBackgroundResource(R.color.owncloud_white);
+        retryCB.setBackgroundResource(R.color.background_color);
         retryCB.setTextSize(8);
         retryCB.setTag(retry_chexbox_tag);
         return retryCB;