Merge branch 'readonly-p4-donut' into donut

This commit is contained in:
Mihai Preda 2009-06-04 12:50:26 -07:00 committed by The Android Open Source Project
commit a15503a4a6

View File

@ -211,6 +211,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
try { try {
Intent i = new Intent(context, MessageCompose.class); Intent i = new Intent(context, MessageCompose.class);
i.putExtra(EXTRA_ACCOUNT, account); i.putExtra(EXTRA_ACCOUNT, account);
i.putExtra(EXTRA_FOLDER, account.getDraftsFolderName());
context.startActivity(i); context.startActivity(i);
} catch (ActivityNotFoundException anfe) { } catch (ActivityNotFoundException anfe) {
// Swallow it - this is usually a race condition, especially under automated test. // Swallow it - this is usually a race condition, especially under automated test.
@ -1239,7 +1240,7 @@ public class MessageCompose extends Activity implements OnClickListener, OnFocus
setNewMessageFocus(); setNewMessageFocus();
mSourceMessageProcessed = true; mSourceMessageProcessed = true;
mDraftNeedsSaving = false; mDraftNeedsSaving = mFolder != null && !mFolder.equals(mAccount.getDraftsFolderName());
} }
/** /**