From 4f61c9b5a47c065503bc57e03ebb5ee293550400 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Thu, 1 Jul 2010 13:45:42 -0700
Subject: [PATCH 1/3] Fixed various minor usability issues. A lot more smooth
 now.

---
 astrid/AndroidManifest.xml                    |  4 +-
 astrid/astrid.launch                          | 25 +++++
 .../andlib/utility/DialogUtilities.java       |  5 +-
 astrid/default.properties                     |  2 +-
 .../astrid/filters/CoreFilterExposer.java     |  5 +-
 ...tailExposer.java => TagDetailExposer.java} |  2 +-
 ...lterExposer.java => TagFilterExposer.java} |  2 +-
 .../com/todoroo/astrid/tags/TagService.java   | 24 +++--
 astrid/res/layout/task_row.xml                |  5 +-
 astrid/res/values/strings-3.0.xml             |  7 +-
 astrid/res/values/strings-filters.xml         |  3 +
 astrid/res/values/styles-3.0.xml              |  7 +-
 .../astrid/activity/FilterListActivity.java   | 92 +++++++++++++------
 .../astrid/activity/TaskEditActivity.java     | 13 +--
 .../astrid/activity/TaskListActivity.java     | 27 +++++-
 .../todoroo/astrid/adapter/TaskAdapter.java   | 13 +--
 astrid/src/com/todoroo/astrid/model/Task.java |  2 +-
 .../service/AstridDependencyInjector.java     |  1 +
 18 files changed, 169 insertions(+), 70 deletions(-)
 create mode 100644 astrid/astrid.launch
 rename astrid/plugin-src/com/todoroo/astrid/tags/{DetailExposer.java => TagDetailExposer.java} (96%)
 rename astrid/plugin-src/com/todoroo/astrid/tags/{FilterExposer.java => TagFilterExposer.java} (98%)

diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 0e04268e3..1cc711c5f 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -182,13 +182,13 @@
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>    
-    <receiver android:name="com.todoroo.astrid.tags.FilterExposer">
+    <receiver android:name="com.todoroo.astrid.tags.TagFilterExposer">
       <intent-filter>
         <action android:name="com.todoroo.astrid.REQUEST_FILTERS" />
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </receiver>    
-    <receiver android:name="com.todoroo.astrid.tags.DetailExposer">
+    <receiver android:name="com.todoroo.astrid.tags.TagDetailExposer">
       <intent-filter>
         <action android:name="com.todoroo.astrid.REQUEST_DETAILS" />
         <category android:name="android.intent.category.DEFAULT" />
diff --git a/astrid/astrid.launch b/astrid/astrid.launch
new file mode 100644
index 000000000..cc219d422
--- /dev/null
+++ b/astrid/astrid.launch
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="com.android.ide.eclipse.adt.debug.LaunchConfigType">
+<stringAttribute key="bad_container_name" value="/astrid.launch"/>
+<intAttribute key="com.android.ide.eclipse.adt.action" value="0"/>
+<stringAttribute key="com.android.ide.eclipse.adt.commandline" value="-scale 0.7"/>
+<intAttribute key="com.android.ide.eclipse.adt.delay" value="0"/>
+<booleanAttribute key="com.android.ide.eclipse.adt.nobootanim" value="true"/>
+<intAttribute key="com.android.ide.eclipse.adt.speed" value="0"/>
+<booleanAttribute key="com.android.ide.eclipse.adt.target" value="true"/>
+<booleanAttribute key="com.android.ide.eclipse.adt.wipedata" value="false"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/astrid"/>
+<listEntry value="/astrid/AndroidManifest.xml"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+<listEntry value="1"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.jdt.launching.ALLOW_TERMINATE" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="astrid"/>
+</launchConfiguration>
diff --git a/astrid/common-src/com/todoroo/andlib/utility/DialogUtilities.java b/astrid/common-src/com/todoroo/andlib/utility/DialogUtilities.java
index 32d5a94a5..8d6f3e4f6 100644
--- a/astrid/common-src/com/todoroo/andlib/utility/DialogUtilities.java
+++ b/astrid/common-src/com/todoroo/andlib/utility/DialogUtilities.java
@@ -15,6 +15,9 @@ public class DialogUtilities {
     @Autowired
     public Integer informationDialogTitleResource;
 
+    @Autowired
+    public Integer confirmDialogTitleResource;
+
     public DialogUtilities() {
         DependencyInjectionService.getInstance().inject(this);
     }
@@ -32,7 +35,7 @@ public class DialogUtilities {
         activity.runOnUiThread(new Runnable() {
             public void run() {
                 new AlertDialog.Builder(activity)
-                .setTitle(informationDialogTitleResource)
+                .setTitle(confirmDialogTitleResource)
                 .setMessage(text)
                 .setView(view)
                 .setIcon(android.R.drawable.ic_dialog_alert)
diff --git a/astrid/default.properties b/astrid/default.properties
index 694331ea4..c5d5335ee 100644
--- a/astrid/default.properties
+++ b/astrid/default.properties
@@ -10,5 +10,5 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-7
+target=android-8
 apk-configurations=
diff --git a/astrid/plugin-src/com/todoroo/astrid/filters/CoreFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/filters/CoreFilterExposer.java
index 24c009b32..089261793 100644
--- a/astrid/plugin-src/com/todoroo/astrid/filters/CoreFilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/filters/CoreFilterExposer.java
@@ -39,7 +39,8 @@ public final class CoreFilterExposer extends BroadcastReceiver {
 
         Filter all = new Filter(CorePlugin.pluginIdentifier, r.getString(R.string.BFE_All),
                 r.getString(R.string.BFE_All),
-                new QueryTemplate().orderBy(Order.desc(Task.MODIFICATION_DATE)),
+                new QueryTemplate().where(Criterion.not(TaskCriteria.isDeleted())).
+                        orderBy(Order.desc(Task.MODIFICATION_DATE)),
                 null);
         all.listingIcon = ((BitmapDrawable)r.getDrawable(R.drawable.filter_all)).getBitmap();
 
@@ -59,7 +60,7 @@ public final class CoreFilterExposer extends BroadcastReceiver {
     @SuppressWarnings("nls")
     public static Filter buildInboxFilter(Resources r) {
         Filter inbox = new Filter(CorePlugin.pluginIdentifier, r.getString(R.string.BFE_Inbox),
-                r.getString(R.string.BFE_Inbox),
+                r.getString(R.string.BFE_Inbox_title),
                 new QueryTemplate().where(Criterion.and(TaskCriteria.isActive(),
                         TaskCriteria.isVisible(DateUtilities.now()))).orderBy(
                                 Order.asc(Functions.caseStatement(Task.DUE_DATE.eq(0),
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/DetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagDetailExposer.java
similarity index 96%
rename from astrid/plugin-src/com/todoroo/astrid/tags/DetailExposer.java
rename to astrid/plugin-src/com/todoroo/astrid/tags/TagDetailExposer.java
index d1399a05e..dcd08bcbd 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/DetailExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagDetailExposer.java
@@ -17,7 +17,7 @@ import com.todoroo.astrid.api.TaskDetail;
  * @author Tim Su <tim@todoroo.com>
  *
  */
-public class DetailExposer extends BroadcastReceiver {
+public class TagDetailExposer extends BroadcastReceiver {
 
     private static TagService tagService = null;
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/FilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
similarity index 98%
rename from astrid/plugin-src/com/todoroo/astrid/tags/FilterExposer.java
rename to astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
index 333086f64..ca0a96c24 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/FilterExposer.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java
@@ -25,7 +25,7 @@ import com.todoroo.astrid.tags.TagService.Tag;
  * @author Tim Su <tim@todoroo.com>
  *
  */
-public class FilterExposer extends BroadcastReceiver {
+public class TagFilterExposer extends BroadcastReceiver {
 
     private TagService tagService;
 
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
index c523155c3..b39a8471d 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java
@@ -2,8 +2,8 @@ package com.todoroo.astrid.tags;
 
 import java.util.ArrayList;
 
-import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.data.Property.CountProperty;
+import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.sql.Criterion;
@@ -112,7 +112,7 @@ public class TagService {
      * Return tags on the given task
      *
      * @param taskId
-     * @return empty array if no tags, otherwise array
+     * @return cursor. PLEASE CLOSE THE CURSOR!
      */
     public TodorooCursor<Metadata> getTags(long taskId) {
         Query query = Query.select(Metadata.VALUE).where(Criterion.and(MetadataCriteria.withKey(KEY),
@@ -129,14 +129,18 @@ public class TagService {
     public String getTagsAsString(long taskId) {
         StringBuilder tagBuilder = new StringBuilder();
         TodorooCursor<Metadata> tags = getTags(taskId);
-        int length = tags.getCount();
-        Metadata metadata = new Metadata();
-        for (int i = 0; i < length; i++) {
-            tags.moveToNext();
-            metadata.readFromCursor(tags);
-            tagBuilder.append(metadata.getValue(Metadata.VALUE));
-            if (i < length - 1)
-                tagBuilder.append(", ");
+        try {
+            int length = tags.getCount();
+            Metadata metadata = new Metadata();
+            for (int i = 0; i < length; i++) {
+                tags.moveToNext();
+                metadata.readFromCursor(tags);
+                tagBuilder.append(metadata.getValue(Metadata.VALUE));
+                if (i < length - 1)
+                    tagBuilder.append(", ");
+            }
+        } finally {
+            tags.close();
         }
         return tagBuilder.toString();
     }
diff --git a/astrid/res/layout/task_row.xml b/astrid/res/layout/task_row.xml
index 03cbaff4b..80270f383 100644
--- a/astrid/res/layout/task_row.xml
+++ b/astrid/res/layout/task_row.xml
@@ -15,7 +15,7 @@
     <!-- completion check-box -->
     <CheckBox android:id="@+id/completeBox"
         android:layout_width="52px"
-        android:layout_height="52px"
+        android:layout_height="fill_parent"
         android:layout_weight="1"
         android:paddingLeft="10px" 
         android:button="@drawable/btn_check"
@@ -25,7 +25,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="100"
-        android:paddingLeft="10px"
+        android:paddingLeft="14px"
+        android:paddingRight="2px"
         android:orientation="vertical">
             
         <!-- task name -->
diff --git a/astrid/res/values/strings-3.0.xml b/astrid/res/values/strings-3.0.xml
index 3470144eb..aceefdce9 100644
--- a/astrid/res/values/strings-3.0.xml
+++ b/astrid/res/values/strings-3.0.xml
@@ -201,8 +201,11 @@ button: add task & go to the edit page.
   <!-- Menu: Help -->    
   <string name="FLA_menu_help">Help</string>
   
-  <!-- Create Shortcut Dialog -->    
-  <string name="FLA_shortcut_dialog">Create Shortcut:</string>
+  <!-- Create Shortcut Dialog Title -->    
+  <string name="FLA_shortcut_dialog_title">Create Shortcut</string>
+  
+  <!-- Create Shortcut Dialog (asks to name shortcut) -->    
+  <string name="FLA_shortcut_dialog">Name of shortcut:</string>
   
   <!-- Search Label-->
   <string name="FLA_search_label">Search For Tasks</string>
diff --git a/astrid/res/values/strings-filters.xml b/astrid/res/values/strings-filters.xml
index 374fad2fe..d8921a5e0 100644
--- a/astrid/res/values/strings-filters.xml
+++ b/astrid/res/values/strings-filters.xml
@@ -6,6 +6,9 @@
     
     <!-- Inbox Filter -->
     <string name="BFE_Inbox">Inbox</string>
+        
+    <!-- Inbox Filter -->
+    <string name="BFE_Inbox_title">Astrid: Inbox</string>
     
     <!-- Completed Filter -->
     <string name="BFE_Completed">Completed</string>
diff --git a/astrid/res/values/styles-3.0.xml b/astrid/res/values/styles-3.0.xml
index 815405ffd..fd595df2e 100644
--- a/astrid/res/values/styles-3.0.xml
+++ b/astrid/res/values/styles-3.0.xml
@@ -32,12 +32,17 @@
 
     <style name="TextAppearance.TAd_ItemTitle">
         <item name="android:textSize">22sp</item>
-        <item name="android:textStyle">bold</item>
     </style>
     
     <style name="TextAppearance.TAd_ItemTitle_Completed" parent="TextAppearance.TAd_ItemTitle">
         <item name="android:textColor">#ff555555</item>
     </style>
+    
+    <style name="TextAppearance.TAd_ItemTitle_Deleted" parent="TextAppearance.TAd_ItemTitle" />
+    
+    <style name="TextAppearance.TAd_ItemTitle_Overdue" parent="TextAppearance.TAd_ItemTitle">
+        <item name="android:textStyle">bold</item>
+    </style>
 
     <style name="TextAppearance.TAd_ItemDetails">
         <item name="android:textSize">14sp</item>
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
index c9401a3b4..fc552aba6 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
@@ -3,6 +3,7 @@
  */
 package com.todoroo.astrid.activity;
 
+import android.app.AlertDialog;
 import android.app.ExpandableListActivity;
 import android.app.SearchManager;
 import android.content.BroadcastReceiver;
@@ -10,18 +11,20 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.widget.EditText;
 import android.widget.ExpandableListView;
-import android.widget.Toast;
 import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
+import android.widget.Toast;
 
 import com.flurry.android.FlurryAgent;
 import com.timsu.astrid.R;
@@ -272,7 +275,9 @@ public class FilterListActivity extends ExpandableListActivity {
             menuItem = menu.add(0, CONTEXT_MENU_SHORTCUT, 0, R.string.FLA_context_shortcut);
             Intent shortcutIntent = new Intent(this, TaskListActivity.class);
             shortcutIntent.setAction(Intent.ACTION_VIEW);
-            shortcutIntent.putExtra(TaskListActivity.TOKEN_FILTER, filter);
+            shortcutIntent.putExtra(TaskListActivity.TOKEN_FILTER_TITLE, filter.title);
+            shortcutIntent.putExtra(TaskListActivity.TOKEN_FILTER_SQL, filter.sqlQuery);
+            shortcutIntent.putExtra(TaskListActivity.TOKEN_FILTER_VALUES, filter.valuesForNewTasks);
             menuItem.setIntent(shortcutIntent);
         }
 
@@ -287,6 +292,46 @@ public class FilterListActivity extends ExpandableListActivity {
             menu.setHeaderTitle(item.listingTitle);
     }
 
+    /**
+     * Creates a shortcut on the user's home screen
+     *
+     * @param shortcutIntent
+     * @param label
+     */
+    private void createShortcut(Filter filter, Intent shortcutIntent, String label) {
+        Bitmap bitmap;
+        if(filter.listingIcon == null)
+            bitmap = ((BitmapDrawable) getResources().getDrawable(
+                    R.drawable.icon_tag)).getBitmap();
+        else {
+            // create icon by superimposing astrid w/ icon
+            bitmap = ((BitmapDrawable) getResources().getDrawable(
+                    R.drawable.icon)).getBitmap();
+            bitmap = bitmap.copy(bitmap.getConfig(), true);
+            Canvas canvas = new Canvas(bitmap);
+            /*canvas.drawBitmap(filter.listingIcon, bitmap.getWidth() -
+                    filter.listingIcon.getWidth(), bitmap.getHeight() -
+                   filter.listingIcon.getHeight(), null);*/
+            canvas.save();
+        }
+        Intent createShortcutIntent = new Intent();
+        createShortcutIntent.putExtra(
+                Intent.EXTRA_SHORTCUT_INTENT,
+                shortcutIntent);
+        createShortcutIntent.putExtra(
+                Intent.EXTRA_SHORTCUT_NAME, label);
+        createShortcutIntent.putExtra(
+                Intent.EXTRA_SHORTCUT_ICON, bitmap);
+        createShortcutIntent.setAction("com.android.launcher.action.INSTALL_SHORTCUT"); //$NON-NLS-1$
+
+        sendBroadcast(createShortcutIntent);
+        Toast.makeText(
+                FilterListActivity.this,
+                getString(
+                        R.string.FLA_toast_onCreateShortcut,
+                        label), Toast.LENGTH_LONG).show();
+    }
+
     @Override
     public boolean onMenuItemSelected(int featureId, final MenuItem item) {
 
@@ -306,37 +351,24 @@ public class FilterListActivity extends ExpandableListActivity {
             ExpandableListContextMenuInfo info = (ExpandableListContextMenuInfo)item.getMenuInfo();
 
             final Intent shortcutIntent = item.getIntent();
-            Filter filter = (Filter)info.targetView.getTag();
+            final Filter filter = (Filter)info.targetView.getTag();
 
-            String dialogText = getString(R.string.FLA_shortcut_dialog);
             final EditText editText = new EditText(this);
             editText.setText(filter.listingTitle);
 
-            dialogUtilities.viewDialog(this, dialogText, editText,
-                    new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int which) {
-                            String label = editText.getText().toString();
-
-                            Intent createShortcutIntent = new Intent();
-                            createShortcutIntent.putExtra(
-                                    Intent.EXTRA_SHORTCUT_INTENT,
-                                    shortcutIntent);
-                            createShortcutIntent.putExtra(
-                                    Intent.EXTRA_SHORTCUT_NAME, label);
-                            createShortcutIntent.putExtra(
-                                    Intent.EXTRA_SHORTCUT_ICON,
-                                    ((BitmapDrawable) getResources().getDrawable(
-                                            R.drawable.icon_tag)).getBitmap());
-                            createShortcutIntent.setAction("com.android.launcher.action.INSTALL_SHORTCUT"); //$NON-NLS-1$
-
-                            sendBroadcast(createShortcutIntent);
-                            Toast.makeText(
-                                    FilterListActivity.this,
-                                    getString(
-                                            R.string.FLA_toast_onCreateShortcut,
-                                            label), Toast.LENGTH_LONG).show();
-                        }
-                    }, null);
+            new AlertDialog.Builder(this)
+            .setTitle(R.string.FLA_shortcut_dialog_title)
+            .setMessage(R.string.FLA_shortcut_dialog)
+            .setView(editText)
+            .setIcon(android.R.drawable.ic_dialog_info)
+            .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int which) {
+                    String label = editText.getText().toString();
+                    createShortcut(filter, shortcutIntent, label);
+                }
+            })
+            .setNegativeButton(android.R.string.cancel, null)
+            .show();
 
             return true;
         }
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
index 575f52030..216ad097f 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
@@ -27,9 +27,9 @@ import java.util.List;
 
 import android.app.AlertDialog;
 import android.app.DatePickerDialog;
+import android.app.DatePickerDialog.OnDateSetListener;
 import android.app.TabActivity;
 import android.app.TimePickerDialog;
-import android.app.DatePickerDialog.OnDateSetListener;
 import android.app.TimePickerDialog.OnTimeSetListener;
 import android.content.ContentValues;
 import android.content.DialogInterface;
@@ -45,6 +45,7 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.AdapterView;
+import android.widget.AdapterView.OnItemSelectedListener;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
@@ -60,22 +61,21 @@ import android.widget.TextView;
 import android.widget.TimePicker;
 import android.widget.Toast;
 import android.widget.ToggleButton;
-import android.widget.AdapterView.OnItemSelectedListener;
 
 import com.flurry.android.FlurryAgent;
 import com.timsu.astrid.R;
 import com.timsu.astrid.data.enums.RepeatInterval;
-import com.timsu.astrid.data.task.TaskModelForEdit;
 import com.timsu.astrid.data.task.AbstractTaskModel.RepeatInfo;
+import com.timsu.astrid.data.task.TaskModelForEdit;
 import com.timsu.astrid.utilities.AstridUtilities;
 import com.timsu.astrid.widget.NumberPicker;
 import com.timsu.astrid.widget.NumberPickerDialog;
-import com.timsu.astrid.widget.TimeDurationControlSet;
 import com.timsu.astrid.widget.NumberPickerDialog.OnNumberPickedListener;
+import com.timsu.astrid.widget.TimeDurationControlSet;
 import com.timsu.astrid.widget.TimeDurationControlSet.TimeDurationType;
-import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.data.Property.IntegerProperty;
 import com.todoroo.andlib.data.Property.StringProperty;
+import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService;
@@ -804,7 +804,7 @@ public final class TaskEditActivity extends TabActivity {
         @Override
         public void writeToModel() {
             UrgencyValue item = urgencyAdapter.getItem(urgency.getSelectedItemPosition());
-            model.setValue(Task.DUE_DATE, item.dueDate);
+            model.setDueDateAndTime(new Date(item.dueDate), item.hasDueTime);
         }
     }
 
@@ -826,6 +826,7 @@ public final class TaskEditActivity extends TabActivity {
 
         public HideUntilControlSet(int hideUntil) {
             this.hideUntil = (Spinner) findViewById(hideUntil);
+            this.hideUntil.setOnItemSelectedListener(this);
         }
 
         private ArrayAdapter<HideUntilValue> adapter;
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 2027f6eef..8eeec1a0a 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -17,19 +17,19 @@ import android.database.Cursor;
 import android.os.Bundle;
 import android.os.Parcelable;
 import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.Window;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.View.OnClickListener;
+import android.view.Window;
 import android.widget.AbsListView;
+import android.widget.AbsListView.OnScrollListener;
+import android.widget.AdapterView.AdapterContextMenuInfo;
 import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
-import android.widget.AbsListView.OnScrollListener;
-import android.widget.AdapterView.AdapterContextMenuInfo;
 
 import com.flurry.android.FlurryAgent;
 import com.timsu.astrid.R;
@@ -38,6 +38,7 @@ import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 import com.todoroo.andlib.service.ExceptionService;
+import com.todoroo.andlib.sql.QueryTemplate;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.Pair;
@@ -83,8 +84,18 @@ public class TaskListActivity extends ListActivity implements OnScrollListener {
 
     // --- constants
 
+    /** token for passing a {@link Filter} object through extras */
     public static final String TOKEN_FILTER = "filter"; //$NON-NLS-1$
 
+    /** token for passing a {@link Filter}'s title through extras */
+    public static final String TOKEN_FILTER_TITLE = "title"; //$NON-NLS-1$
+
+    /** token for passing a {@link Filter}'s sql through extras */
+    public static final String TOKEN_FILTER_SQL = "sql"; //$NON-NLS-1$
+
+    /** token for passing a {@link Filter}'s values for new tasks through extras */
+    public static final String TOKEN_FILTER_VALUES = "values"; //$NON-NLS-1$
+
     // --- instance variables
 
     @Autowired
@@ -126,7 +137,15 @@ public class TaskListActivity extends ListActivity implements OnScrollListener {
 
         Bundle extras = getIntent().getExtras();
         if(extras != null && extras.containsKey(TOKEN_FILTER)) {
+            // probably launched from filter list activity
             filter = extras.getParcelable(TOKEN_FILTER);
+        } else if(extras != null && extras.containsKey(TOKEN_FILTER_SQL)) {
+            // launched from desktop shortcut, must create a fake filter
+            String title = extras.getString(TOKEN_FILTER_TITLE);
+            String sql = extras.getString(TOKEN_FILTER_SQL);
+            ContentValues values = extras.getParcelable(TOKEN_FILTER_VALUES);
+            filter = new Filter("", "", title, new QueryTemplate(), values);
+            filter.sqlQuery = sql;
         } else {
             filter = CoreFilterExposer.buildInboxFilter(getResources());
         }
diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
index 7c4b30db5..ec9235ff0 100644
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@@ -11,11 +11,11 @@ import android.content.res.Resources;
 import android.database.Cursor;
 import android.graphics.Paint;
 import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.View.OnCreateContextMenuListener;
+import android.view.ViewGroup;
 import android.widget.CheckBox;
 import android.widget.CursorAdapter;
 import android.widget.LinearLayout;
@@ -185,14 +185,14 @@ public class TaskAdapter extends CursorAdapter {
         ViewHolder viewHolder = (ViewHolder)view.getTag();
 
         // don't bother instantiating views if we're busy
-        if(isFling) {
+        /*if(isFling) {
             viewHolder.details.removeViews(2, viewHolder.details.getChildCount() - 2);
             viewHolder.dueDate.setVisibility(View.INVISIBLE);
             viewHolder.nameView.setText(R.string.TAd_flingText);
             viewHolder.importance.setVisibility(View.INVISIBLE);
             viewHolder.completeBox.setVisibility(View.INVISIBLE);
             return;
-        }
+        }*/
 
         // name
         final TextView nameView = viewHolder.nameView; {
@@ -239,8 +239,9 @@ public class TaskAdapter extends CursorAdapter {
             }
         }
 
-        // other information - send out a request for it
-        final LinearLayout detailsView = viewHolder.details; {
+        // other information - send out a request for it (only if not fling)
+        final LinearLayout detailsView = viewHolder.details;
+        if(!isFling) {
             detailsView.removeViews(2, detailsView.getChildCount() - 2);
             if(detailCache.containsKey(task.getId())) {
                 ArrayList<TaskDetail> details = detailCache.get(task.getId());
diff --git a/astrid/src/com/todoroo/astrid/model/Task.java b/astrid/src/com/todoroo/astrid/model/Task.java
index 993d88cbf..87f73f86a 100644
--- a/astrid/src/com/todoroo/astrid/model/Task.java
+++ b/astrid/src/com/todoroo/astrid/model/Task.java
@@ -267,7 +267,7 @@ public final class Task extends AbstractModel {
      * @param date
      * @param hasDueTime
      */
-    public void setDueDate(Date dueDate, boolean hasDueTime) {
+    public void setDueDateAndTime(Date dueDate, boolean hasDueTime) {
         if(!hasDueTime) {
             dueDate.setHours(23);
             dueDate.setMinutes(59);
diff --git a/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java b/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java
index d1151e60a..34c310d84 100644
--- a/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java
+++ b/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java
@@ -70,6 +70,7 @@ public class AstridDependencyInjector implements AbstractDependencyInjector {
         // com.todoroo.android.utility
         injectables.put("dialogUtilities", DialogUtilities.class);
         injectables.put("informationDialogTitleResource", R.string.DLG_information_title);
+        injectables.put("confirmDialogTitleResource", R.string.DLG_confirm_title);
         injectables.put("dateUtilities", DateUtilities.class);
         injectables.put("yearsResource", R.plurals.DUt_years);
         injectables.put("monthsResource", R.plurals.DUt_months);

From 8bb4e95530b82fa8fdc92145289962acd1b3fa7e Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Thu, 1 Jul 2010 14:20:22 -0700
Subject: [PATCH 2/3] Removed some stuff that took up extra space, made the
 icon thing work well.

---
 astrid/AndroidManifest.xml                    |   1 -
 astrid/res/drawable/ic_dialog_alert_c.png     | Bin 3724 -> 0 bytes
 astrid/res/drawable/ic_dialog_info_c.png      | Bin 3657 -> 0 bytes
 astrid/res/drawable/ic_dialog_time_c.png      | Bin 1924 -> 0 bytes
 astrid/res/drawable/icon.png                  | Bin 15034 -> 6888 bytes
 astrid/res/drawable/icon_add.png              | Bin 3863 -> 0 bytes
 astrid/res/drawable/icon_blank.png            | Bin 0 -> 3556 bytes
 astrid/res/drawable/icon_tag.png              | Bin 3704 -> 0 bytes
 astrid/res/drawable/tea_tab_basic.png         | Bin 2659 -> 2294 bytes
 astrid/res/drawable/tea_tab_extensions.png    | Bin 3452 -> 2397 bytes
 astrid/res/drawable/tea_tab_extra.png         | Bin 4486 -> 2928 bytes
 .../astrid/activities/TagListSubActivity.java |  10 ++---
 .../astrid/activity/FilterListActivity.java   |  36 ++++++++++--------
 13 files changed, 25 insertions(+), 22 deletions(-)
 delete mode 100644 astrid/res/drawable/ic_dialog_alert_c.png
 delete mode 100644 astrid/res/drawable/ic_dialog_info_c.png
 delete mode 100644 astrid/res/drawable/ic_dialog_time_c.png
 delete mode 100644 astrid/res/drawable/icon_add.png
 create mode 100644 astrid/res/drawable/icon_blank.png
 delete mode 100644 astrid/res/drawable/icon_tag.png

diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 1cc711c5f..42d820afb 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -78,7 +78,6 @@
     </activity>
     <!-- Activity that creates or edits tasks -->
     <activity android:name="com.todoroo.astrid.activity.TaskEditActivity"
-              android:icon="@drawable/icon_add"
               android:label="@string/taskEdit_label">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
diff --git a/astrid/res/drawable/ic_dialog_alert_c.png b/astrid/res/drawable/ic_dialog_alert_c.png
deleted file mode 100644
index d0c6f2f39855f54ec7b352e817484e2459b59a0b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3724
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

diff --git a/astrid/res/drawable/ic_dialog_info_c.png b/astrid/res/drawable/ic_dialog_info_c.png
deleted file mode 100644
index a11458967c1c3afd4e0187961fd3ca58080d4eae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3657
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
brzL*__`_6W)Hd%S00000NkvXXu0mjflETis

diff --git a/astrid/res/drawable/ic_dialog_time_c.png b/astrid/res/drawable/ic_dialog_time_c.png
deleted file mode 100644
index 20b805ad1277a706544fefc86df4eaeda0111046..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1924
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
KMNUMnLSTXcNTezN

diff --git a/astrid/res/drawable/icon.png b/astrid/res/drawable/icon.png
index fee7992e4002ca1ff00599d983557c8a2cb32fd3..25402e7f6cfe30f5793ff716be4cf4210a503d01 100644
GIT binary patch
literal 6888
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

literal 15034
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
QY5)KL07*qoM6N<$g3X>o6aWAK

diff --git a/astrid/res/drawable/icon_add.png b/astrid/res/drawable/icon_add.png
deleted file mode 100644
index 98e0658384f8b87958ddb40e46ce3acf00f22577..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3863
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
Z{{Z32-9UyT_bLDY002ovPDHLkV1iDGX!8I7

diff --git a/astrid/res/drawable/icon_blank.png b/astrid/res/drawable/icon_blank.png
new file mode 100644
index 0000000000000000000000000000000000000000..d490f6130df073d62abc9e061a5466b84326a30f
GIT binary patch
literal 3556
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

literal 0
HcmV?d00001

diff --git a/astrid/res/drawable/icon_tag.png b/astrid/res/drawable/icon_tag.png
deleted file mode 100644
index bf3e1969b5523cd4083e66a2ccc45d4f9e5c45b1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3704
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
WSrw}^jFRR60000<MNUMnLSTZXl^CV~

diff --git a/astrid/res/drawable/tea_tab_basic.png b/astrid/res/drawable/tea_tab_basic.png
index 91cc4b0d17e2465a1bc94dd0b28bf42db3ec0a7d..8ef006005bf96ea3b2a6607de2771825d619db7a 100644
GIT binary patch
delta 2256
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

delta 2624
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

diff --git a/astrid/res/drawable/tea_tab_extensions.png b/astrid/res/drawable/tea_tab_extensions.png
index 5ddce8801914cd413e25b8dd5e722e74857b224f..8bad05dfca1be60e8c33fec6b4b50a5426683eb1 100644
GIT binary patch
delta 2360
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

delta 3423
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
BW5xgg

diff --git a/astrid/res/drawable/tea_tab_extra.png b/astrid/res/drawable/tea_tab_extra.png
index 69323d56795645d3b191720615de042834b4df7f..de1e16e4cce8d54d918d58c0eca49ff996d312cd 100644
GIT binary patch
delta 2895
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

delta 4465
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
D;A(Oq

diff --git a/astrid/src-legacy/com/timsu/astrid/activities/TagListSubActivity.java b/astrid/src-legacy/com/timsu/astrid/activities/TagListSubActivity.java
index ff5d79478..b2073c015 100644
--- a/astrid/src-legacy/com/timsu/astrid/activities/TagListSubActivity.java
+++ b/astrid/src-legacy/com/timsu/astrid/activities/TagListSubActivity.java
@@ -38,22 +38,22 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.util.Log;
 import android.view.ContextMenu;
+import android.view.ContextMenu.ContextMenuInfo;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.view.ViewGroup;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.View.OnCreateContextMenuListener;
+import android.view.ViewGroup;
 import android.widget.AdapterView;
+import android.widget.AdapterView.AdapterContextMenuInfo;
+import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ArrayAdapter;
 import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
-import android.widget.AdapterView.AdapterContextMenuInfo;
-import android.widget.AdapterView.OnItemClickListener;
 
 import com.flurry.android.FlurryAgent;
 import com.timsu.astrid.R;
@@ -405,7 +405,7 @@ public class TagListSubActivity extends SubActivity {
 
             createShortcutIntent.putExtra(Intent.EXTRA_SHORTCUT_NAME, label);
             createShortcutIntent.putExtra(Intent.EXTRA_SHORTCUT_ICON,
-                    ((BitmapDrawable)r.getDrawable(R.drawable.icon_tag)).getBitmap());
+                    ((BitmapDrawable)r.getDrawable(R.drawable.icon_blank)).getBitmap());
             createShortcutIntent.setAction("com.android.launcher.action.INSTALL_SHORTCUT"); //$NON-NLS-1$
 
             getParent().sendBroadcast(createShortcutIntent);
diff --git a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
index fc552aba6..8d89d6d6e 100644
--- a/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
@@ -24,6 +24,7 @@ import android.view.View;
 import android.widget.EditText;
 import android.widget.ExpandableListView;
 import android.widget.ExpandableListView.ExpandableListContextMenuInfo;
+import android.widget.FrameLayout;
 import android.widget.Toast;
 
 import com.flurry.android.FlurryAgent;
@@ -299,21 +300,19 @@ public class FilterListActivity extends ExpandableListActivity {
      * @param label
      */
     private void createShortcut(Filter filter, Intent shortcutIntent, String label) {
-        Bitmap bitmap;
-        if(filter.listingIcon == null)
-            bitmap = ((BitmapDrawable) getResources().getDrawable(
-                    R.drawable.icon_tag)).getBitmap();
-        else {
-            // create icon by superimposing astrid w/ icon
-            bitmap = ((BitmapDrawable) getResources().getDrawable(
-                    R.drawable.icon)).getBitmap();
-            bitmap = bitmap.copy(bitmap.getConfig(), true);
-            Canvas canvas = new Canvas(bitmap);
-            /*canvas.drawBitmap(filter.listingIcon, bitmap.getWidth() -
-                    filter.listingIcon.getWidth(), bitmap.getHeight() -
-                   filter.listingIcon.getHeight(), null);*/
-            canvas.save();
-        }
+        Bitmap emblem = filter.listingIcon;
+        if(emblem == null)
+            emblem = ((BitmapDrawable) getResources().getDrawable(
+                    R.drawable.filter_tags1)).getBitmap();
+        // create icon by superimposing astrid w/ icon
+        Bitmap bitmap = ((BitmapDrawable) getResources().getDrawable(
+                R.drawable.icon_blank)).getBitmap();
+        bitmap = bitmap.copy(bitmap.getConfig(), true);
+        Canvas canvas = new Canvas(bitmap);
+        canvas.drawBitmap(emblem, Math.max(0, bitmap.getWidth() -
+                emblem.getWidth()), Math.max(0, bitmap.getHeight() -
+               emblem.getHeight()), null);
+
         Intent createShortcutIntent = new Intent();
         createShortcutIntent.putExtra(
                 Intent.EXTRA_SHORTCUT_INTENT,
@@ -353,13 +352,18 @@ public class FilterListActivity extends ExpandableListActivity {
             final Intent shortcutIntent = item.getIntent();
             final Filter filter = (Filter)info.targetView.getTag();
 
+            FrameLayout frameLayout = new FrameLayout(this);
+            frameLayout.setPadding(10, 0, 10, 0);
             final EditText editText = new EditText(this);
             editText.setText(filter.listingTitle);
+            frameLayout.addView(editText, new FrameLayout.LayoutParams(
+                    FrameLayout.LayoutParams.FILL_PARENT,
+                    FrameLayout.LayoutParams.WRAP_CONTENT));
 
             new AlertDialog.Builder(this)
             .setTitle(R.string.FLA_shortcut_dialog_title)
             .setMessage(R.string.FLA_shortcut_dialog)
-            .setView(editText)
+            .setView(frameLayout)
             .setIcon(android.R.drawable.ic_dialog_info)
             .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                 public void onClick(DialogInterface dialog, int which) {

From 06bacd38efdba9f91e5a0ae758375299e4794277 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Fri, 2 Jul 2010 20:12:35 -0700
Subject: [PATCH 3/3] updated preference ish

---
 astrid/res/xml/preferences.xml           | 117 +++--------------------
 astrid/res/xml/preferences_reminders.xml |  49 ++++++++++
 2 files changed, 62 insertions(+), 104 deletions(-)
 create mode 100644 astrid/res/xml/preferences_reminders.xml

diff --git a/astrid/res/xml/preferences.xml b/astrid/res/xml/preferences.xml
index cad90874b..42b54e085 100644
--- a/astrid/res/xml/preferences.xml
+++ b/astrid/res/xml/preferences.xml
@@ -2,120 +2,29 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <PreferenceCategory
-        android:title="@string/prefs_category_alerts">
-        <ListPreference
-            android:key="@string/p_notif_quietStart"
-            android:entries="@array/EPr_quiet_hours_start"
-            android:entryValues="@array/EPr_quiet_hours_start_values"
-            android:title="@string/prefs_quietStart_title"
-            android:summary="@string/prefs_quietStart_desc" />
+    <PreferenceScreen
+        android:title="@string/EPr_defaults_header">
         <ListPreference
-            android:key="@string/p_notif_quietEnd"
-            android:entries="@array/EPr_quiet_hours_end"
-            android:entryValues="@array/EPr_quiet_hours_end_values"
-            android:title="@string/prefs_quietEnd_title"
-            android:summary="@string/prefs_quietEnd_desc" />
-        <CheckBoxPreference
-            android:key="@string/p_notif_annoy"
-            android:title="@string/prefs_annoy_title"
-            android:summary="@string/prefs_annoy_desc" />
-        <CheckBoxPreference
-            android:key="@string/p_notif_vibrate"
-            android:title="@string/prefs_vibrate_title"
-            android:summary="@string/prefs_vibrate_desc" />
-        <EditTextPreference
-            android:key="@string/p_notif_defaultRemind"
-            android:title="@string/prefs_defaultRemind_title"
-            android:summary="@string/prefs_defaultRemind_desc" />
-        <RingtonePreference
-            android:key="@string/p_notification_ringtone"
-            android:title="@string/prefs_notification_title"
-            android:summary="@string/prefs_notification_desc"
-            android:ringtoneType="notification"
-    		android:showDefault="true"
-    		android:showSilent="true" />
+            android:key="@string/EPr_default_importance_key"  
+            android:entries="@array/EPr_default_importance"  
+            android:entryValues="@array/EPr_default_importance_values"  
+            android:title="@string/EPr_default_importance_title" />
+    
         <ListPreference
-            android:key="@string/p_notif_icon"
-            android:entries="@array/notif_icon_entries"
-            android:entryValues="@array/notif_icon_values"
-            android:title="@string/prefs_notificon_title"
-            android:summary="@string/prefs_notificon_desc" />
-
-    </PreferenceCategory>
+            android:key="@string/EPr_default_urgency_key"  
+            android:entries="@array/EPr_default_urgency"  
+            android:entryValues="@array/EPr_default_urgency_values"  
+            android:title="@string/EPr_default_urgency_title" />
+    </PreferenceScreen>  
 
     <PreferenceCategory
         android:title="@string/prefs_category_appearance">
-        <CheckBoxPreference
-            android:key="@string/p_colorize"
-            android:title="@string/prefs_colorize_title"
-            android:summary="@string/prefs_colorize_desc" />
         <ListPreference
             android:key="@string/p_fontSize"
             android:entries="@array/EPr_font_size"
             android:entryValues="@array/EPr_font_size"
             android:title="@string/prefs_fontSize_title"
             android:summary="@string/prefs_fontSize_desc" />
-        <PreferenceScreen
-            android:title="@string/displayedFields_PrefScreen_Title"
-            android:summary="@string/displayedFields_PrefScreen_Desc">
-            <CheckBoxPreference
-               android:key="@string/prefs_deadlineVisible"
-               android:title="@string/prefs_deadlineVisible_title"
-               android:summary="@string/prefs_deadlineVisible_desc"
-               android:defaultValue="@string/prefs_deadlineVisible_default"  />
-            <CheckBoxPreference
-               android:key="@string/prefs_tagsVisible"
-               android:title="@string/prefs_tagsVisible_title"
-               android:summary="@string/prefs_tagsVisible_desc"
-               android:defaultValue="@string/prefs_tagsVisible_default"  />
-            <CheckBoxPreference
-               android:key="@string/prefs_importanceVisible"
-               android:title="@string/prefs_importanceVisible_title"
-               android:summary="@string/prefs_importanceVisible_desc"
-               android:defaultValue="@string/prefs_importanceVisible_default"  />
-            <CheckBoxPreference
-               android:key="@string/prefs_timeVisible"
-               android:title="@string/prefs_timeVisible_title"
-               android:summary="@string/prefs_timeVisible_desc"
-               android:defaultValue="@string/prefs_timeVisible_default"  />
-            <CheckBoxPreference
-               android:key="@string/prefs_reminderVisible"
-               android:title="@string/prefs_reminderVisible_title"
-               android:summary="@string/prefs_reminderVisible_desc"
-               android:defaultValue="@string/prefs_reminderVisible_default"  />
-            <CheckBoxPreference
-               android:key="@string/prefs_repeatVisible"
-               android:title="@string/prefs_repeatVisible_title"
-               android:summary="@string/prefs_repeatVisible_desc"
-               android:defaultValue="@string/prefs_repeatVisible_default"  />
-            <CheckBoxPreference
-               android:key="@string/prefs_notesVisible"
-               android:title="@string/prefs_notesVisible_title"
-               android:summary="@string/prefs_notesVisible_desc"
-               android:defaultValue="@string/prefs_notesVisible_default"  />
-        </PreferenceScreen>
-    </PreferenceCategory>
-
-    <PreferenceCategory
-        android:title="@string/prefs_category_other">
-        <CheckBoxPreference
-           android:key="@string/p_nagging"
-           android:title="@string/prefs_nagging_title"
-           android:summary="@string/prefs_nagging_desc"
-           android:defaultValue="true"  />
-        <EditTextPreference
-            android:key="@string/p_deadlineTime"
-            android:title="@string/prefs_deadlineTime_title"
-            android:summary="@string/prefs_deadlineTime_desc" />
-        <CheckBoxPreference
-            android:key="@string/p_backup"
-            android:title="@string/prefs_backup_title"
-            android:summary="@string/prefs_backup_desc"
-            android:defaultValue="true" />
-       <ListPreference
-            android:key="@string/prefs_defaultCalendar"
-            android:title="@string/prefs_defaultCalendar_title"
-            android:summary="@string/prefs_defaultCalendar_desc" />
     </PreferenceCategory>
+    
 </PreferenceScreen>
\ No newline at end of file
diff --git a/astrid/res/xml/preferences_reminders.xml b/astrid/res/xml/preferences_reminders.xml
new file mode 100644
index 000000000..3f25dec4f
--- /dev/null
+++ b/astrid/res/xml/preferences_reminders.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:title="@string/rmd_EPr_alerts_header">
+
+    <ListPreference
+        android:key="@string/p_notif_quietStart"
+        android:entries="@array/EPr_quiet_hours_start"
+        android:entryValues="@array/EPr_quiet_hours_start_values"
+        android:title="@string/prefs_quietStart_title"
+        android:summary="@string/prefs_quietStart_desc" />
+    <ListPreference
+        android:key="@string/p_notif_quietEnd"
+        android:entries="@array/EPr_quiet_hours_end"
+        android:entryValues="@array/EPr_quiet_hours_end_values"
+        android:title="@string/prefs_quietEnd_title"
+        android:summary="@string/prefs_quietEnd_desc" />
+    <CheckBoxPreference
+        android:key="@string/p_notif_annoy"
+        android:title="@string/prefs_annoy_title"
+        android:summary="@string/prefs_annoy_desc" />
+    <CheckBoxPreference
+        android:key="@string/p_notif_vibrate"
+        android:title="@string/prefs_vibrate_title"
+        android:summary="@string/prefs_vibrate_desc" />
+    <EditTextPreference
+        android:key="@string/p_notif_defaultRemind"
+        android:title="@string/prefs_defaultRemind_title"
+        android:summary="@string/prefs_defaultRemind_desc" />
+    <RingtonePreference
+        android:key="@string/p_notification_ringtone"
+        android:title="@string/prefs_notification_title"
+        android:summary="@string/prefs_notification_desc"
+        android:ringtoneType="notification"
+		android:showDefault="true"
+		android:showSilent="true" />
+    <ListPreference
+        android:key="@string/p_notif_icon"
+        android:entries="@array/notif_icon_entries"
+        android:entryValues="@array/notif_icon_values"
+        android:title="@string/prefs_notificon_title"
+        android:summary="@string/prefs_notificon_desc" />
+    <CheckBoxPreference
+       android:key="@string/p_nagging"
+       android:title="@string/prefs_nagging_title"
+       android:summary="@string/prefs_nagging_desc"
+       android:defaultValue="true"  />
+       
+</PreferenceScreen>
\ No newline at end of file