ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Fix message list pressed state color"

Browse Source
This commit is contained in:
Ben Komalo 2011-10-07 11:05:58 -07:00 committed by Android (Google) Code Review
commit 7e984e8c0b
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/com/android/email/activity/MessageListFragment.java
View File

@ -48,7 +48,6 @@ import android.view.View.OnDragListener;
import android.view.View.OnTouchListener; import android.view.View.OnTouchListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.AdapterView.OnItemLongClickListener; import android.widget.AdapterView.OnItemLongClickListener;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
@ -81,7 +80,7 @@ import java.util.Set;
* {@link #isViewCreated()}. * {@link #isViewCreated()}.
*/ */
public class MessageListFragment extends ListFragment public class MessageListFragment extends ListFragment
implements OnItemClickListener, OnItemLongClickListener, MessagesAdapter.Callback, implements OnItemLongClickListener, MessagesAdapter.Callback,
MoveMessageToDialog.Callback, OnDragListener, OnTouchListener { MoveMessageToDialog.Callback, OnDragListener, OnTouchListener {
private static final String BUNDLE_LIST_STATE = "MessageListFragment.state.listState"; private static final String BUNDLE_LIST_STATE = "MessageListFragment.state.listState";
private static final String BUNDLE_KEY_SELECTED_MESSAGE_ID private static final String BUNDLE_KEY_SELECTED_MESSAGE_ID
@ -405,7 +404,6 @@ public class MessageListFragment extends ListFragment
super.onActivityCreated(savedInstanceState); super.onActivityCreated(savedInstanceState);
final ListView lv = getListView(); final ListView lv = getListView();
lv.setOnItemClickListener(this);
lv.setOnItemLongClickListener(this); lv.setOnItemLongClickListener(this);
lv.setOnTouchListener(this); lv.setOnTouchListener(this);
lv.setItemsCanFocus(false); lv.setItemsCanFocus(false);
@ -594,7 +592,7 @@ public class MessageListFragment extends ListFragment
* Called when a message is clicked. * Called when a message is clicked.
*/ */
@Override @Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) { public void onListItemClick(ListView parent, View view, int position, long id) {
if (view != mListFooterView) { if (view != mListFooterView) {
MessageListItem itemView = (MessageListItem) view; MessageListItem itemView = (MessageListItem) view;
onMessageOpen(itemView.mMailboxId, id); onMessageOpen(itemView.mMailboxId, id);
@ -783,9 +781,29 @@ public class MessageListFragment extends ListFragment
* @param messageId ID of the message to open. * @param messageId ID of the message to open.
*/ */
private void onMessageOpen(final long messageMailboxId, final long messageId) { private void onMessageOpen(final long messageMailboxId, final long messageId) {
if ((mMailbox != null) && (mMailbox.mId == messageMailboxId)) {
// Normal case - the message belongs in the mailbox list we're viewing.
mCallback.onMessageOpen(messageId, messageMailboxId,
getMailboxId(), callbackTypeForMailboxType(mMailbox.mType));
return;
}
// Weird case - a virtual mailbox where the messages could come from different mailbox
// types - here we have to query the DB for the type.
new MessageOpenTask(messageMailboxId, messageId).cancelPreviousAndExecuteParallel(); new MessageOpenTask(messageMailboxId, messageId).cancelPreviousAndExecuteParallel();
} }
private int callbackTypeForMailboxType(int mailboxType) {
switch (mailboxType) {
case Mailbox.TYPE_DRAFTS:
return Callback.TYPE_DRAFT;
case Mailbox.TYPE_TRASH:
return Callback.TYPE_TRASH;
default:
return Callback.TYPE_REGULAR;
}
}
/** /**
* Task to look up the mailbox type for a message, and kicks the callback. * Task to look up the mailbox type for a message, and kicks the callback.
*/ */
@ -804,14 +822,8 @@ public class MessageListFragment extends ListFragment
// Restore the mailbox type. Note we can't use mMailbox.mType here, because // Restore the mailbox type. Note we can't use mMailbox.mType here, because
// we don't have mMailbox for combined mailbox. // we don't have mMailbox for combined mailbox.
// ("All Starred" can contain any kind of messages.) // ("All Starred" can contain any kind of messages.)
switch (Mailbox.getMailboxType(mActivity, mMessageMailboxId)) { return callbackTypeForMailboxType(
case Mailbox.TYPE_DRAFTS: Mailbox.getMailboxType(mActivity, mMessageMailboxId));
return Callback.TYPE_DRAFT;
case Mailbox.TYPE_TRASH:
return Callback.TYPE_TRASH;
default:
return Callback.TYPE_REGULAR;
}
} }
@Override @Override

2
src/com/android/email/activity/MessageListItem.java
View File

@ -373,7 +373,7 @@ public class MessageListItem extends View {
mColorChipPaint); mColorChipPaint);
} }
int fontColor = (isActivated() || isPressed()) ? sFontColorActivated : sFontColor; int fontColor = isActivated() ? sFontColorActivated : sFontColor;
// Draw the checkbox // Draw the checkbox
canvas.drawBitmap(mAdapter.isSelected(this) ? sSelectedIconOn : sSelectedIconOff, canvas.drawBitmap(mAdapter.isSelected(this) ? sSelectedIconOn : sSelectedIconOff,