Merge branch 'readonly-p4-donut' into donut
This commit is contained in:
commit
a15503a4a6
@ -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());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user