diff --git a/res/drawable/list_selector.xml b/res/drawable/list_selector.xml index d5881ab891..e0e86b3467 100644 --- a/res/drawable/list_selector.xml +++ b/res/drawable/list_selector.xml @@ -22,6 +22,6 @@ - + diff --git a/res/drawable/main_header_bg.xml b/res/drawable/main_header_bg.xml index 855ba2c1d8..8cd82e4bb6 100644 --- a/res/drawable/main_header_bg.xml +++ b/res/drawable/main_header_bg.xml @@ -19,8 +19,8 @@ --> diff --git a/res/layout-v14/generic_explanation.xml b/res/layout-v14/generic_explanation.xml index 4bd3cddb8f..d3964564b4 100644 --- a/res/layout-v14/generic_explanation.xml +++ b/res/layout-v14/generic_explanation.xml @@ -19,7 +19,7 @@ diff --git a/res/layout/failed_upload_files.xml b/res/layout/failed_upload_files.xml index 0f459a0b9c..b4deeed3c7 100644 --- a/res/layout/failed_upload_files.xml +++ b/res/layout/failed_upload_files.xml @@ -20,7 +20,7 @@ diff --git a/res/layout/failed_upload_message_view.xml b/res/layout/failed_upload_message_view.xml index 41e9a7d0ed..cf20544552 100644 --- a/res/layout/failed_upload_message_view.xml +++ b/res/layout/failed_upload_message_view.xml @@ -2,7 +2,7 @@ android:id="@+id/failed_upload_message_view" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:background="@color/owncloud_white" + android:background="@color/background_color" android:orientation="vertical" > diff --git a/res/layout/files.xml b/res/layout/files.xml index 74a9e4b417..50bc105959 100644 --- a/res/layout/files.xml +++ b/res/layout/files.xml @@ -20,7 +20,7 @@ diff --git a/res/layout/fragment_changelog.xml b/res/layout/fragment_changelog.xml index e218236550..bc29e10fd2 100644 --- a/res/layout/fragment_changelog.xml +++ b/res/layout/fragment_changelog.xml @@ -19,7 +19,7 @@ diff --git a/res/layout/generic_explanation.xml b/res/layout/generic_explanation.xml index be98f3b89f..cd8875533f 100644 --- a/res/layout/generic_explanation.xml +++ b/res/layout/generic_explanation.xml @@ -19,7 +19,7 @@ diff --git a/res/layout/preview_image_fragment.xml b/res/layout/preview_image_fragment.xml index 3deb2fd4ce..253c829bad 100644 --- a/res/layout/preview_image_fragment.xml +++ b/res/layout/preview_image_fragment.xml @@ -23,7 +23,7 @@ android:id="@+id/fdScrollView" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:background="@color/owncloud_white" + android:background="@color/background_color" android:gravity="center_horizontal" --> @@ -32,7 +32,7 @@ android:id="@+id/top" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:background="@color/owncloud_white" + android:background="@color/background_color" tools:context=".ui.fragment.PreviewImageFragment" > #DDDDDD #00ddff - #F7F7F7 \ No newline at end of file diff --git a/res/values/setup.xml b/res/values/setup.xml index d65bff5ddc..2c73d269df 100644 --- a/res/values/setup.xml +++ b/res/values/setup.xml @@ -17,4 +17,9 @@ off off + + #F7F7F7 + #1D2D44 + #1D2D44 + diff --git a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java index 26bbf63f63..f0ee721931 100644 --- a/src/com/owncloud/android/ui/activity/InstantUploadActivity.java +++ b/src/com/owncloud/android/ui/activity/InstantUploadActivity.java @@ -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;