Merge pull request #152 from todoroo/120222_as_ui_fixes

Added new widget 9 patch and fixed timer activity not showing up
pull/14/head
Tim Su 13 years ago
commit 3728c3d93c

@ -413,7 +413,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
}
private void addComment() {
addComment(commentField.getText().toString(), "task_comment", true); //$NON-NLS-1$
addComment(commentField.getText().toString(), UpdateAdapter.UPDATE_TASK_COMMENT, true);
}
@ -527,7 +527,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
addComment(String.format("%s %s", //$NON-NLS-1$
getContext().getString(R.string.TEA_timer_comment_started),
DateUtilities.getTimeString(getContext(), new Date())),
"task_started", //$NON-NLS-1$
UpdateAdapter.UPDATE_TASK_COMMENT,
false);
}
@ -538,7 +538,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
getContext().getString(R.string.TEA_timer_comment_stopped),
DateUtilities.getTimeString(getContext(), new Date()),
getContext().getString(R.string.TEA_timer_comment_spent),
elapsedTime), "task_stopped", false); //$NON-NLS-1$
elapsedTime), UpdateAdapter.UPDATE_TASK_COMMENT, false);
}
/*

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

@ -16,7 +16,7 @@
<TextView
android:id="@+id/widget_title"
android:layout_gravity="left"
android:layout_width="128dp"
android:layout_width="163dp"
android:layout_height="47dp"
android:textColor="#ffffff"
android:textSize="14sp"

@ -16,7 +16,7 @@
<TextView
android:id="@+id/widget_title"
android:layout_gravity="left"
android:layout_width="128dp"
android:layout_width="163dp"
android:layout_height="40dp"
android:textColor="#ffffff"
android:textSize="14sp"

@ -16,7 +16,7 @@
<TextView
android:id="@+id/widget_title"
android:layout_width="82dp"
android:layout_width="100dp"
android:layout_height="50dp"
android:layout_gravity="left"
android:textColor="#ffffff"

@ -1,7 +1,5 @@
package com.todoroo.astrid.adapter;
import com.todoroo.astrid.helper.AsyncImageView;
import java.io.IOException;
import org.json.JSONException;
@ -33,6 +31,7 @@ import com.todoroo.andlib.service.DependencyInjectionService;
import com.todoroo.andlib.utility.DateUtilities;
import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
import com.todoroo.astrid.data.Update;
import com.todoroo.astrid.helper.AsyncImageView;
import com.todoroo.astrid.helper.ImageDiskCache;
/**
@ -60,12 +59,12 @@ public class UpdateAdapter extends CursorAdapter {
private static final String UPDATE_TASK_COMPLETED = "task_completed"; //$NON-NLS-1$
private static final String UPDATE_TASK_UNCOMPLETED = "task_uncompleted"; //$NON-NLS-1$
private static final String UPDATE_TASK_TAGGED = "task_tagged"; //$NON-NLS-1$
private static final String UPDATE_TASK_ASSIGNED = "task_assigned";
private static final String UPDATE_TASK_COMMENT = "task_comment";
private static final String UPDATE_TAG_COMMENT = "tag_comment";
public static final String FROM_TAG_VIEW = "from_tag";
public static final String FROM_TASK_VIEW = "from_task";
public static final String FROM_RECENT_ACTIVITY_VIEW = "from_recent_activity";
private static final String UPDATE_TASK_ASSIGNED = "task_assigned"; //$NON-NLS-1$
public static final String UPDATE_TASK_COMMENT = "task_comment"; //$NON-NLS-1$
private static final String UPDATE_TAG_COMMENT = "tag_comment"; //$NON-NLS-1$
public static final String FROM_TAG_VIEW = "from_tag"; //$NON-NLS-1$
public static final String FROM_TASK_VIEW = "from_task"; //$NON-NLS-1$
public static final String FROM_RECENT_ACTIVITY_VIEW = "from_recent_activity"; //$NON-NLS-1$
/**
* Constructor
*

Loading…
Cancel
Save