diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
index b34e9f1d5..070204df6 100644
--- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java
@@ -292,10 +292,10 @@ public class TaskListFragment extends InjectingListFragment implements OnSortSel
private void setupRefresh(SwipeRefreshLayout layout) {
layout.setOnRefreshListener(this);
layout.setColorScheme(
- R.color.refresh_color_1,
- R.color.refresh_color_2,
- R.color.refresh_color_3,
- R.color.refresh_color_4);
+ R.color.importance_1,
+ R.color.importance_2,
+ R.color.importance_3,
+ R.color.importance_4);
}
@Override
diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/ErrorCatchingEditText.java b/astrid/src/main/java/com/todoroo/astrid/ui/ErrorCatchingEditText.java
deleted file mode 100644
index f093cb5ab..000000000
--- a/astrid/src/main/java/com/todoroo/astrid/ui/ErrorCatchingEditText.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.todoroo.astrid.ui;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.EditText;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ErrorCatchingEditText extends EditText {
-
- private static final Logger log = LoggerFactory.getLogger(ErrorCatchingEditText.class);
-
- public ErrorCatchingEditText(Context context, AttributeSet attrs,
- int defStyle) {
- super(context, attrs, defStyle);
-
- }
-
- public ErrorCatchingEditText(Context context, AttributeSet attrs) {
- super(context, attrs);
-
- }
-
- public ErrorCatchingEditText(Context context) {
- super(context);
-
- }
-
- @Override
- public int getExtendedPaddingTop() {
- try {
- return super.getExtendedPaddingTop();
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return 0;
- }
- }
-
- @Override
- public int getExtendedPaddingBottom() {
- try {
- return super.getExtendedPaddingBottom();
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return 0;
- }
- }
-
-}
diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/ErrorCatchingSpinner.java b/astrid/src/main/java/com/todoroo/astrid/ui/ErrorCatchingSpinner.java
deleted file mode 100644
index 15bc1382f..000000000
--- a/astrid/src/main/java/com/todoroo/astrid/ui/ErrorCatchingSpinner.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Copyright (c) 2012 Todoroo Inc
- *
- * See the file "LICENSE" for the full license governing this code.
- */
-package com.todoroo.astrid.ui;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.widget.Spinner;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ErrorCatchingSpinner extends Spinner {
-
- private static final Logger log = LoggerFactory.getLogger(ErrorCatchingSpinner.class);
-
- public ErrorCatchingSpinner(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
-
- @Override
- protected void onDetachedFromWindow() {
- try {
- super.onDetachedFromWindow();
- } catch (IllegalArgumentException e) {
- // Bad times
- log.error(e.getMessage(), e);
- }
- }
-
-}
diff --git a/astrid/src/main/res/layout/control_set_gcal.xml b/astrid/src/main/res/layout/control_set_gcal.xml
index cc8268a80..0cf8ad4c3 100644
--- a/astrid/src/main/res/layout/control_set_gcal.xml
+++ b/astrid/src/main/res/layout/control_set_gcal.xml
@@ -16,7 +16,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content">
-
diff --git a/astrid/src/main/res/layout/control_set_hide.xml b/astrid/src/main/res/layout/control_set_hide.xml
index 8e04d08f7..758a5b4bf 100644
--- a/astrid/src/main/res/layout/control_set_hide.xml
+++ b/astrid/src/main/res/layout/control_set_hide.xml
@@ -9,7 +9,7 @@
android:orientation="vertical"
android:layout_width="0dip"
android:layout_height="0dip">
-
diff --git a/astrid/src/main/res/layout/control_set_notes.xml b/astrid/src/main/res/layout/control_set_notes.xml
index aeb1170c4..cc33a84c6 100644
--- a/astrid/src/main/res/layout/control_set_notes.xml
+++ b/astrid/src/main/res/layout/control_set_notes.xml
@@ -39,6 +39,7 @@
android:autoText="true"
android:capitalize="sentences"
android:singleLine="false"
+ android:textColorHint="@color/widget_text_color_light"
android:textColor="?attr/asTextColor"
android:freezesText="true" />
diff --git a/astrid/src/main/res/layout/control_set_reminders.xml b/astrid/src/main/res/layout/control_set_reminders.xml
index fe331c218..c4aa5c06d 100644
--- a/astrid/src/main/res/layout/control_set_reminders.xml
+++ b/astrid/src/main/res/layout/control_set_reminders.xml
@@ -55,7 +55,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10dip"
android:text="@string/TEA_reminder_randomly" />
-
@@ -85,7 +85,7 @@
android:gravity="right"
android:paddingLeft="10dip"
android:textColor="?attr/asThemeTextColor" />
-
diff --git a/astrid/src/main/res/layout/control_set_repeat.xml b/astrid/src/main/res/layout/control_set_repeat.xml
index 987d4b332..536d16134 100644
--- a/astrid/src/main/res/layout/control_set_repeat.xml
+++ b/astrid/src/main/res/layout/control_set_repeat.xml
@@ -37,7 +37,8 @@
-
diff --git a/astrid/src/main/res/layout/control_set_title.xml b/astrid/src/main/res/layout/control_set_title.xml
index 03c9252a9..209e2ac3a 100644
--- a/astrid/src/main/res/layout/control_set_title.xml
+++ b/astrid/src/main/res/layout/control_set_title.xml
@@ -24,7 +24,7 @@
android:scaleType="center"
android:src="@drawable/btn_check" />
-
+ android:layout_height="?attr/actionBarSize"
+ android:background="?attr/asAbBackgroundColor" />
diff --git a/astrid/src/main/res/values/colors.xml b/astrid/src/main/res/values/colors.xml
index 4cdbbd0e8..735bfdbbf 100644
--- a/astrid/src/main/res/values/colors.xml
+++ b/astrid/src/main/res/values/colors.xml
@@ -25,11 +25,6 @@
#303030
#dde1eb
- #ff33b5e5
- #ffffbb33
- #ff99cc00
- #ffff4444
-
#dddddd
#efefef
diff --git a/astrid/src/main/res/values/styles.xml b/astrid/src/main/res/values/styles.xml
index 6813b2e15..85ae54463 100644
--- a/astrid/src/main/res/values/styles.xml
+++ b/astrid/src/main/res/values/styles.xml
@@ -59,8 +59,6 @@
- @null
-
-