Merge commit 'f6fda92606ee81b8116270da780d053293c9b575'
* commit 'f6fda92606ee81b8116270da780d053293c9b575':
Help with another push inconsistency edge case (#2131432)
Merge commit '89966059c997a410c0b54be2d56e1259ed99940f' into eclair-mr2-plus-aosp
* commit '89966059c997a410c0b54be2d56e1259ed99940f':
MessageCompose: corretly set initial mSourceMessageProcessed=true for the cases where there's no source message, to avoid duplicated email addresses on orientation change.
Merge commit '1a377f096f3a263bba536355823290db4bba7434' into eclair-plus-aosp
* commit '1a377f096f3a263bba536355823290db4bba7434':
MessageCompose: corretly set initial mSourceMessageProcessed=true for the cases where there's no source message, to avoid duplicated email addresses on orientation change.
Merge commit '1a377f096f3a263bba536355823290db4bba7434' into eclair-mr2
* commit '1a377f096f3a263bba536355823290db4bba7434':
MessageCompose: corretly set initial mSourceMessageProcessed=true for the cases where there's no source message, to avoid duplicated email addresses on orientation change.
Merge commit '5b2a84472ea71906677c91bd5e154df89c967282'
* commit '5b2a84472ea71906677c91bd5e154df89c967282':
Use constants for elements in projections.
Merge commit '54ac1169103658689526063a012fdce59bd50dd6'
* commit '54ac1169103658689526063a012fdce59bd50dd6':
Handle change from push to other intervals properly (#2165032)
Merge commit '84ae53c85014715f9852438305a628824d27dce4'
* commit '84ae53c85014715f9852438305a628824d27dce4':
MessageCompose: allow sending email when started through external intent.
Merge commit '8be9b8937be04cc50e7fd2e79d2d91c99aace1b5' into eclair-mr2-plus-aosp
* commit '8be9b8937be04cc50e7fd2e79d2d91c99aace1b5':
Make sure we hold WakeLock during mail sending (fixes#2180551)
Merge commit '0fd132d26c0846c00419cae124fb7f881331418b' into eclair-mr2-plus-aosp
* commit '0fd132d26c0846c00419cae124fb7f881331418b':
Allow photo changes to be uploaded to Exchange (fixes#2179082)
Merge commit 'ea878be11729cd793d9183fc264118241cd5a5b6' into eclair-plus-aosp
* commit 'ea878be11729cd793d9183fc264118241cd5a5b6':
Make sure we hold WakeLock during mail sending (fixes#2180551)
Merge commit 'ea878be11729cd793d9183fc264118241cd5a5b6' into eclair-mr2
* commit 'ea878be11729cd793d9183fc264118241cd5a5b6':
Make sure we hold WakeLock during mail sending (fixes#2180551)
* Don't runAsleep unless this is a Ping
* Relates to #2178288 in that it's possible that the system could
sleep while we're trying to send (not sure if this is possible;
will check), so we prevent it by holding a WakeLock in this case
Change-Id: Ib3f8786501b942e1cfcb7a0bbb07b8e3084e2a86
Merge commit '479b22a2f8966b63789c89e878b615ebd53708c0' into eclair-plus-aosp
* commit '479b22a2f8966b63789c89e878b615ebd53708c0':
Make multiselect buttons update when the list state changes
Merge commit '479b22a2f8966b63789c89e878b615ebd53708c0' into eclair-mr2
* commit '479b22a2f8966b63789c89e878b615ebd53708c0':
Make multiselect buttons update when the list state changes
Merge commit '4b59cfc8ed4054ffb5ad85cea8aba94a430cc2cb' into eclair-plus-aosp
* commit '4b59cfc8ed4054ffb5ad85cea8aba94a430cc2cb':
Fix problem with timeouts and sending attachments (#2178288)
Merge commit '4b59cfc8ed4054ffb5ad85cea8aba94a430cc2cb' into eclair-mr2
* commit '4b59cfc8ed4054ffb5ad85cea8aba94a430cc2cb':
Fix problem with timeouts and sending attachments (#2178288)
* Standard Exchange command timeouts are 20 seconds
* For sending, however, these need to be significantly longer to
handle the case of sending large attachments, as sending (of any
length) happens in a single HTTP Post command
* Having an infinite timeout leads to the (small) possibility of the
Outbox hanging for a long time, holding up the sending of other
mail, so we set a long, but not infinite timeout for this case
* Timeout now set for 15 minutes
* Prevent sync of Outbox and Drafts (the UI triggers these by changing
the contents of these boxes, but we need to ignore the pings that
are generated this way)
Change-Id: I5b830d6b4e94525d95138b2112be12898a37882e
Merge commit 'b634dbf618f03eb19801139fed6c8237db0d01d2' into eclair-plus-aosp
* commit 'b634dbf618f03eb19801139fed6c8237db0d01d2':
Import revised translations. DO NOT MERGE
Merge commit '268d5faa1c7494e395bf99c5184a9e9dd98df568' into eclair-mr2-plus-aosp
* commit '268d5faa1c7494e395bf99c5184a9e9dd98df568':
Import revised translations. DO NOT MERGE
Merge commit 'b634dbf618f03eb19801139fed6c8237db0d01d2' into eclair-mr2
* commit 'b634dbf618f03eb19801139fed6c8237db0d01d2':
Import revised translations. DO NOT MERGE
