diff --git a/astrid/res/drawable/background_gradient.xml b/astrid/res/drawable/background_gradient.xml
deleted file mode 100644
index 31ec36dff..000000000
--- a/astrid/res/drawable/background_gradient.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
diff --git a/astrid/res/drawable/background_white.xml b/astrid/res/drawable/background_white.xml
deleted file mode 100644
index 0ca7c8476..000000000
--- a/astrid/res/drawable/background_white.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
diff --git a/astrid/res/drawable/bluebutton.png b/astrid/res/drawable/bluebutton.png
deleted file mode 100644
index f92b0df00..000000000
Binary files a/astrid/res/drawable/bluebutton.png and /dev/null differ
diff --git a/astrid/res/drawable/file_name_background.xml b/astrid/res/drawable/file_name_background.xml
deleted file mode 100644
index f5645b4ea..000000000
--- a/astrid/res/drawable/file_name_background.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/astrid/res/drawable/footer_background.png b/astrid/res/drawable/footer_background.png
deleted file mode 100644
index ab471113d..000000000
Binary files a/astrid/res/drawable/footer_background.png and /dev/null differ
diff --git a/astrid/res/drawable/footer_button.xml b/astrid/res/drawable/footer_button.xml
deleted file mode 100644
index 35f1cf927..000000000
--- a/astrid/res/drawable/footer_button.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/astrid/res/drawable/footer_button_normal.png b/astrid/res/drawable/footer_button_normal.png
deleted file mode 100644
index 2be97d424..000000000
Binary files a/astrid/res/drawable/footer_button_normal.png and /dev/null differ
diff --git a/astrid/res/drawable/footer_button_pressed.png b/astrid/res/drawable/footer_button_pressed.png
deleted file mode 100644
index 15e7a2f47..000000000
Binary files a/astrid/res/drawable/footer_button_pressed.png and /dev/null differ
diff --git a/astrid/res/drawable/footer_button_selected.png b/astrid/res/drawable/footer_button_selected.png
deleted file mode 100644
index fcdc8fc53..000000000
Binary files a/astrid/res/drawable/footer_button_selected.png and /dev/null differ
diff --git a/astrid/res/drawable/footer_comment_edittext.xml b/astrid/res/drawable/footer_comment_edittext.xml
deleted file mode 100644
index 3e7ab7fc2..000000000
--- a/astrid/res/drawable/footer_comment_edittext.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
diff --git a/astrid/res/drawable/footer_comment_edittext_focused.xml b/astrid/res/drawable/footer_comment_edittext_focused.xml
deleted file mode 100644
index e9139bd63..000000000
--- a/astrid/res/drawable/footer_comment_edittext_focused.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/astrid/res/drawable/footer_comment_edittext_normal.xml b/astrid/res/drawable/footer_comment_edittext_normal.xml
deleted file mode 100644
index 9bb2857f8..000000000
--- a/astrid/res/drawable/footer_comment_edittext_normal.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
-
-
-
-
-
diff --git a/astrid/res/drawable/footer_edittext.xml b/astrid/res/drawable/footer_edittext.xml
deleted file mode 100644
index b3401b8f2..000000000
--- a/astrid/res/drawable/footer_edittext.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
diff --git a/astrid/res/drawable/footer_edittext_focus.9.png b/astrid/res/drawable/footer_edittext_focus.9.png
deleted file mode 100644
index f28f9b6fa..000000000
Binary files a/astrid/res/drawable/footer_edittext_focus.9.png and /dev/null differ
diff --git a/astrid/res/drawable/footer_edittext_normal.9.png b/astrid/res/drawable/footer_edittext_normal.9.png
deleted file mode 100644
index 1a24c8727..000000000
Binary files a/astrid/res/drawable/footer_edittext_normal.9.png and /dev/null differ
diff --git a/astrid/res/drawable/footer_greenbtn.xml b/astrid/res/drawable/footer_greenbtn.xml
deleted file mode 100644
index 4a4d650f3..000000000
--- a/astrid/res/drawable/footer_greenbtn.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/astrid/res/drawable/footer_greenbtn_normal.9.png b/astrid/res/drawable/footer_greenbtn_normal.9.png
deleted file mode 100644
index 5430ca7a0..000000000
Binary files a/astrid/res/drawable/footer_greenbtn_normal.9.png and /dev/null differ
diff --git a/astrid/res/drawable/footer_greenbtn_pressed.9.png b/astrid/res/drawable/footer_greenbtn_pressed.9.png
deleted file mode 100644
index b8a0e1a41..000000000
Binary files a/astrid/res/drawable/footer_greenbtn_pressed.9.png and /dev/null differ
diff --git a/astrid/res/drawable/footer_redbtn.xml b/astrid/res/drawable/footer_redbtn.xml
deleted file mode 100644
index 937e5e558..000000000
--- a/astrid/res/drawable/footer_redbtn.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/astrid/res/drawable/footer_redbtn_normal.9.png b/astrid/res/drawable/footer_redbtn_normal.9.png
deleted file mode 100644
index 5b76d996d..000000000
Binary files a/astrid/res/drawable/footer_redbtn_normal.9.png and /dev/null differ
diff --git a/astrid/res/drawable/footer_redbtn_pressed.9.png b/astrid/res/drawable/footer_redbtn_pressed.9.png
deleted file mode 100644
index 20e137bd1..000000000
Binary files a/astrid/res/drawable/footer_redbtn_pressed.9.png and /dev/null differ
diff --git a/astrid/res/drawable/gl_date.png b/astrid/res/drawable/gl_date.png
deleted file mode 100644
index 393c94ef1..000000000
Binary files a/astrid/res/drawable/gl_date.png and /dev/null differ
diff --git a/astrid/res/drawable/gl_list.png b/astrid/res/drawable/gl_list.png
deleted file mode 100644
index 56b9670c8..000000000
Binary files a/astrid/res/drawable/gl_list.png and /dev/null differ
diff --git a/astrid/res/drawable/gl_time.png b/astrid/res/drawable/gl_time.png
deleted file mode 100644
index 7ae4f8fbd..000000000
Binary files a/astrid/res/drawable/gl_time.png and /dev/null differ
diff --git a/astrid/res/drawable/ic_menu_camera.png b/astrid/res/drawable/ic_menu_camera.png
deleted file mode 100644
index 99442f943..000000000
Binary files a/astrid/res/drawable/ic_menu_camera.png and /dev/null differ
diff --git a/astrid/res/drawable/icn_arrow_over.png b/astrid/res/drawable/icn_arrow_over.png
deleted file mode 100644
index db06ba2e0..000000000
Binary files a/astrid/res/drawable/icn_arrow_over.png and /dev/null differ
diff --git a/astrid/res/drawable/icn_premium_checkmark.png b/astrid/res/drawable/icn_premium_checkmark.png
deleted file mode 100644
index f7bd23960..000000000
Binary files a/astrid/res/drawable/icn_premium_checkmark.png and /dev/null differ
diff --git a/astrid/res/drawable/icon_producteev.png b/astrid/res/drawable/icon_producteev.png
deleted file mode 100644
index 89c94ecaf..000000000
Binary files a/astrid/res/drawable/icon_producteev.png and /dev/null differ
diff --git a/astrid/res/drawable/notif_boring_working.png b/astrid/res/drawable/notif_boring_working.png
deleted file mode 100644
index a91e799d6..000000000
Binary files a/astrid/res/drawable/notif_boring_working.png and /dev/null differ
diff --git a/astrid/res/drawable/notif_pink_working.png b/astrid/res/drawable/notif_pink_working.png
deleted file mode 100644
index 4e4e561b5..000000000
Binary files a/astrid/res/drawable/notif_pink_working.png and /dev/null differ
diff --git a/astrid/res/drawable/post_it.png b/astrid/res/drawable/post_it.png
deleted file mode 100644
index b921b2b1b..000000000
Binary files a/astrid/res/drawable/post_it.png and /dev/null differ
diff --git a/astrid/res/drawable/separator.png b/astrid/res/drawable/separator.png
deleted file mode 100644
index 93373654f..000000000
Binary files a/astrid/res/drawable/separator.png and /dev/null differ
diff --git a/astrid/res/drawable/speech_bubble.9.png b/astrid/res/drawable/speech_bubble.9.png
deleted file mode 100644
index 9ed7badab..000000000
Binary files a/astrid/res/drawable/speech_bubble.9.png and /dev/null differ
diff --git a/astrid/res/layout/featured_list_activity.xml b/astrid/res/layout/featured_list_activity.xml
deleted file mode 100644
index 99789bebb..000000000
--- a/astrid/res/layout/featured_list_activity.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/astrid/res/layout/header_people_view.xml b/astrid/res/layout/header_people_view.xml
deleted file mode 100644
index d582f9f6a..000000000
--- a/astrid/res/layout/header_people_view.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/astrid/res/layout/people_view_wrapper_activity.xml b/astrid/res/layout/people_view_wrapper_activity.xml
deleted file mode 100644
index 750a5557f..000000000
--- a/astrid/res/layout/people_view_wrapper_activity.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/astrid/res/values/colors.xml b/astrid/res/values/colors.xml
index eecbfa8cc..7efaacb2f 100644
--- a/astrid/res/values/colors.xml
+++ b/astrid/res/values/colors.xml
@@ -14,20 +14,6 @@
#ffcfcfcf
#ffb8b8b8
#ffa0a0a0
-
- #33ffffff
-
- #FFFB6666
- #ffF0E89E
- #ff88AAFF
- #ff888888
- #ff888888
-
- #ff44bb66
- #ffbbbbbb
- #ffff0000
-
- #438cb6
#888888
diff --git a/astrid/res/values/keys.xml b/astrid/res/values/keys.xml
index 36459b128..90e3404ac 100644
--- a/astrid/res/values/keys.xml
+++ b/astrid/res/values/keys.xml
@@ -183,16 +183,8 @@
- 08
-
- - 0
- - 1
- - 3
- - 8
-
-
- colorize
font_size
p_taskRowStyle
notesVisible
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index e41e4a68d..383d183c9 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -227,7 +227,7 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
tlfPager.setOnPageChangeListener(this);
}
- protected int getHeaderView() {
+ private int getHeaderView() {
return R.layout.header_nav_views;
}
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index 2e901af1f..a41b72bf7 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -793,16 +793,18 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
new HashMap(3);
@SuppressWarnings("nls")
public Drawable getDrawable(String source) {
+ int drawable = 0;
if(source.equals("silk_clock"))
- source = "details_alarm";
+ drawable = R.drawable.details_alarm;
else if(source.equals("silk_tag_pink"))
- source = "details_tag";
+ drawable = R.drawable.details_tag;
else if(source.equals("silk_date"))
- source = "details_repeat";
+ drawable = R.drawable.details_repeat;
else if(source.equals("silk_note"))
- source = "details_note";
+ drawable = R.drawable.details_note;
- int drawable = resources.getIdentifier("drawable/" + source, null, Constants.PACKAGE);
+ if (drawable == 0)
+ drawable = resources.getIdentifier("drawable/" + source, null, Constants.PACKAGE);
if(drawable == 0)
return null;
Drawable d;