fix the build

It's a redo of changes made to MessageListXLFragmentManager on If4048d45.

It's a gerrit bug -- if you rename a file which has been changed in another CL,
gerrit allows you to submit it without rebasing it.

Change-Id: I1a9741befd1a4c2e74ce7afffca976b98e82a357
This commit is contained in:
Makoto Onuki 2011-04-27 13:28:52 -07:00
parent 8b6e443cdd
commit 6ea2c7c4a7

View File

@ -52,7 +52,6 @@ import java.util.Set;
* TODO Refine "move to".
*/
class UIControllerTwoPane implements
MoveMessageToDialog.Callback,
MailboxFinder.Callback,
ThreePaneLayout.Callback,
MailboxListFragment.Callback,
@ -169,13 +168,6 @@ class UIControllerTwoPane implements
Log.e(Logging.LOG_TAG, "unable to find mailbox");
}
// MoveMessageToDialog$Callback
@Override
public void onMoveToMailboxSelected(long newMailboxId, long[] messageIds) {
ActivityHelper.moveMessages(mActivity, newMailboxId, messageIds);
onCurrentMessageGone();
}
// ThreePaneLayoutCallback
@Override
public void onVisiblePanesChanged(int previousVisiblePanes) {
@ -275,6 +267,11 @@ class UIControllerTwoPane implements
*/
@Override
public void onAdvancingOpAccepted(Set<Long> affectedMessages) {
if (!isMessageSelected()) {
// Do nothing if message view is not visible.
return;
}
int autoAdvanceDir = Preferences.getPreferences(mActivity).getAutoAdvanceDirection();
if ((autoAdvanceDir == Preferences.AUTO_ADVANCE_MESSAGE_LIST) || (mOrderManager == null)) {
if (affectedMessages.contains(getMessageId())) {
@ -363,17 +360,10 @@ class UIControllerTwoPane implements
}
@Override
public void onBeforeMessageDelete() {
public void onBeforeMessageGone() {
onCurrentMessageGone();
}
@Override
public void onMoveMessage() {
long messageId = getMessageId();
MoveMessageToDialog dialog = MoveMessageToDialog.newInstance(new long[] {messageId}, null);
dialog.show(mActivity.getFragmentManager(), "dialog");
}
@Override
public void onForward() {
MessageCompose.actionForward(mActivity, getMessageId());