Tony Mantler
350af5a956
am d946f831
: Merge "Reply-all setting is modified at runtime, don\'t cache it in a static map" into jb-ub-mail-ur10
...
* commit 'd946f8319a34c922ac720d5cf9cc95540300ccd5':
Reply-all setting is modified at runtime, don't cache it in a static map
2013-10-04 14:23:14 -07:00
Tony Mantler
d946f8319a
Merge "Reply-all setting is modified at runtime, don't cache it in a static map" into jb-ub-mail-ur10
2013-10-04 21:21:26 +00:00
Tony Mantler
bdbff6a6e4
am 7c24f48a
: Merge "Remove notifications while we still know what type of account this is" into jb-ub-mail-ur10
...
* commit '7c24f48a37c465fff393c546198ee83c556961ef':
Remove notifications while we still know what type of account this is
2013-10-04 13:33:53 -07:00
Martin Hibdon
c16b2d7783
am 387612f4
: Merge "Fix display for inlined and non-inlined attachments" into jb-ub-mail-ur10
...
* commit '387612f46972dbcbf367fc51327f95e2c2968af0':
Fix display for inlined and non-inlined attachments
2013-10-04 13:33:52 -07:00
Tony Mantler
7c24f48a37
Merge "Remove notifications while we still know what type of account this is" into jb-ub-mail-ur10
2013-10-04 20:28:42 +00:00
Tony Mantler
b424ffa65b
Reply-all setting is modified at runtime, don't cache it in a static map
...
b/11066041
Change-Id: I4e14c3add3fe2503e8369dbb7ef976e110ef2fee
2013-10-04 13:25:26 -07:00
Martin Hibdon
387612f469
Merge "Fix display for inlined and non-inlined attachments" into jb-ub-mail-ur10
2013-10-04 20:13:16 +00:00
Tony Mantler
ac1d3249fb
Remove notifications while we still know what type of account this is
...
Also add null check just in case
b/11070468
Change-Id: I187b9b084512a2b994f4a0a3b750ade5eee50624
2013-10-04 12:27:20 -07:00
Martin Hibdon
fc8a57bb29
Fix display for inlined and non-inlined attachments
...
b/11069575
The problem is that the UI_MESSAGE query strips out
any inlined attachments, but the UI_ATTACHMENTS query
does not. This means that we display all attachments
at the bottom, regardless of whether or not they're
inlined, but the formatting is wrong because when we measured
we only had the non-inlined attachments.
Maybe we should not display the inlined attachments at
the bottom, but right now if we do that, it's impossible
to save an inlined image. So for now, I'm just making
UI_MESSAGE query keep the inlined attachments so that
both queries have the same behavior.
Change-Id: I155f5bb74dbfbc8dbf02b56dca58fbca3da5da78
2013-10-04 12:13:02 -07:00
Tony Mantler
140493e769
am 840408c4
: Remove mAmAccount from the email provider account object
...
* commit '840408c41cfc95ffa491aaf11f1c3f4075eae9c9':
Remove mAmAccount from the email provider account object
2013-10-04 12:00:13 -07:00
Tony Mantler
840408c41c
Remove mAmAccount from the email provider account object
...
b/11070468
Change-Id: I51bad4be41800e4cd6dae42744005ade784cdf82
2013-10-04 10:21:25 -07:00
Baligh Uddin
8bbff8e377
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11
2013-10-04 14:34:29 +00:00
Baligh Uddin
ca0ea5ce74
Import translations. DO NOT MERGE
...
Change-Id: I4a20fd88487f3b456730970eb814fbaa7383625c
Auto-generated-cl: translation import
2013-10-04 07:30:53 -07:00
Baligh Uddin
803ffba88b
am 91508db9
: (-s ours) Import translations. DO NOT MERGE
...
* commit '91508db973c0fad13cb9f7eda5dc7745505a8a91':
Import translations. DO NOT MERGE
2013-10-04 07:24:09 -07:00
Baligh Uddin
91508db973
Import translations. DO NOT MERGE
...
Change-Id: I1d362db3f053cff7d4090f530c015a5f2b582565
Auto-generated-cl: translation import
2013-10-04 07:16:59 -07:00
Tony Mantler
2f5df8e7da
am f086deac
: Change notification code to key off android.accounts.Account
...
* commit 'f086deac70a5ee893ebd14be9d0502132e0fa988':
Change notification code to key off android.accounts.Account
2013-10-03 14:46:10 -07:00
Tony Mantler
f086deac70
Change notification code to key off android.accounts.Account
...
b/11023774
Change-Id: I6dd267591148378265b0f12c7ea6d74b450a0f3d
2013-10-03 13:26:55 -07:00
Jerry Xie
815807578b
am 26c8e755
: Increment Email version.
...
* commit '26c8e7551d741450fabd7089043769f9c00ef4a4':
Increment Email version.
2013-10-03 09:13:24 -07:00
Jerry Xie
26c8e7551d
Increment Email version.
...
Change-Id: I068bab01903d66af14d283fee1ccabb29bba1ae2
2013-10-02 22:13:02 -07:00
Baligh Uddin
77904a194a
am f8549a37
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
...
* commit 'f8549a3712037f3b1b039d27e281cb145117a0f6':
Import translations. DO NOT MERGE
2013-10-02 21:12:14 -07:00
Baligh Uddin
89fc603f98
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11
2013-10-03 04:09:41 +00:00
Baligh Uddin
f8549a3712
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
2013-10-03 04:09:34 +00:00
Baligh Uddin
009b00408a
Import translations. DO NOT MERGE
...
Change-Id: I59d6cf620cea6a1f4757ae94b3a6295ad8bbf1cd
Auto-generated-cl: translation import
2013-10-02 18:25:55 -07:00
Baligh Uddin
7fc3ca9398
Import translations. DO NOT MERGE
...
Change-Id: I1a50b8ed8254113e185967e2ce470b7e27e93812
Auto-generated-cl: translation import
2013-10-02 18:25:23 -07:00
Paul Sliwowski
26906a9a0c
am 7df98d0a
: Fix autodiscovery failed dialog.
...
* commit '7df98d0a6d0a3c67b467e9ff2066970e645957b8':
Fix autodiscovery failed dialog.
2013-10-02 18:22:38 -07:00
Paul Sliwowski
7df98d0a6d
Fix autodiscovery failed dialog.
...
Bug: 11030161
Change-Id: Id97766969608016efe068e5c142407ad94438b05
2013-10-02 16:00:33 -07:00
Martin Hibdon
26913460f1
am 921c04d2
: Add some logging
...
* commit '921c04d2ac5df091fb3c5cfa823e6dc2fc6cdf5a':
Add some logging
2013-10-01 17:35:38 -07:00
Martin Hibdon
921c04d2ac
Add some logging
...
Change-Id: Ib26ffad0bb6841361b8ee7be4ee2a6255d509ae2
2013-10-01 17:08:16 -07:00
Andrew Sapperstein
ec04b69ae1
am 0d233273
: Merge "Update widget photo. Fixes b/10972758." into jb-ub-mail-ur10
...
* commit '0d233273de995138707ffd8b07d398ba96133397':
Update widget photo. Fixes b/10972758.
2013-10-01 15:38:51 -07:00
Andrew Sapperstein
0d233273de
Merge "Update widget photo. Fixes b/10972758." into jb-ub-mail-ur10
2013-10-01 22:33:46 +00:00
Andrew Sapperstein
cdb89d5de3
Update widget photo. Fixes b/10972758.
...
Change-Id: I71b30158a9f42da34d38ffb7ad144881646fb4ce
2013-10-01 15:23:44 -07:00
Tony Mantler
61e4a041f2
am 768c6b86
: Don\'t show "No messages" when starting a search on Exchange
...
* commit '768c6b86db854569a687f68c9b8f232e9ebf1573':
Don't show "No messages" when starting a search on Exchange
2013-10-01 12:16:48 -07:00
Tony Mantler
768c6b86db
Don't show "No messages" when starting a search on Exchange
...
Also clean up some finals
b/11027351
Change-Id: Ib76cc90b04acb531d53b2d6bdc4e3b0ad911f72c
2013-10-01 12:02:47 -07:00
Baligh Uddin
ca32123996
am 1bccfccd
: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
...
* commit '1bccfccd9adfa4714e87831e5add9495c437a11e':
Import translations. DO NOT MERGE
2013-09-30 21:44:23 -07:00
Baligh Uddin
ffffdfc87a
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11
2013-10-01 04:43:31 +00:00
Baligh Uddin
1bccfccd9a
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
2013-10-01 04:41:39 +00:00
Yu Ping Hu
5817e80821
am 2add3d3c
: Increment Email version.
...
* commit '2add3d3c904f4642b56336b44b1d5238d1ecd27d':
Increment Email version.
2013-09-30 18:23:37 -07:00
Yu Ping Hu
2add3d3c90
Increment Email version.
...
Change-Id: I8397ae0ef23a44f1303d22290b7e3a4acbdf5989
2013-09-30 18:01:32 -07:00
Tony Mantler
3ad8fad1a9
am 53ecec0a
: Merge "Only return messages that are unread and unseen for an unseen query" into jb-ub-mail-ur10
...
* commit '53ecec0ad43866b00d28908ba19e67561674591c':
Only return messages that are unread and unseen for an unseen query
2013-09-30 17:20:20 -07:00
Martin Hibdon
fbb7169011
am 2cf965b8
: Merge "Make draft attachments work correctly" into jb-ub-mail-ur10
...
* commit '2cf965b85fe4daa1046d7d04137c3b24d1e2800b':
Make draft attachments work correctly
2013-09-30 16:42:03 -07:00
Tony Mantler
7b1a11bb5c
am b38c7d1c
: Avoid ANR due to looking up account info on the main thread
...
* commit 'b38c7d1c37bba593b7aaba44a9ffccc8cf3a4108':
Avoid ANR due to looking up account info on the main thread
2013-09-30 16:42:03 -07:00
Tony Mantler
53ecec0ad4
Merge "Only return messages that are unread and unseen for an unseen query" into jb-ub-mail-ur10
2013-09-30 23:34:19 +00:00
Baligh Uddin
2852d97c93
Import translations. DO NOT MERGE
...
Change-Id: I7fd5f542f15b6498a90691a20478eecef7600069
Auto-generated-cl: translation import
2013-09-30 15:40:58 -07:00
Baligh Uddin
b4a8872e5b
Import translations. DO NOT MERGE
...
Change-Id: I22cd41a256167e2b378351d4dc37737a40d92b1a
Auto-generated-cl: translation import
2013-09-30 15:40:25 -07:00
Tony Mantler
d4a06f409d
Only return messages that are unread and unseen for an unseen query
...
b/10970849
Change-Id: I23d40fc39987fab35521f1dd75f4631f1fae16d5
2013-09-30 15:32:42 -07:00
Martin Hibdon
2cf965b85f
Merge "Make draft attachments work correctly" into jb-ub-mail-ur10
2013-09-30 22:23:42 +00:00
Martin Hibdon
f484751e06
Make draft attachments work correctly
...
b/10968838
The main problem here is that Ui Attachment was always using
a content Uri that was generated using the attachment's account
Id and rowId. This works correctly for attachments in messages
we have received, but it does not work for drafts: Draft attachments
are not stored in the normal place, rather, they are stored in
the cache directory. There is an additional column in the
Attachment table, called cachedFile, which is not replicated in the
Ui attachment. That's okay though, if we have a cachedFile, then
when we are populating a Ui Attachment, we should just use that
for content Uri.
Also, I discoverd that for draft attachments, we were not correctly
setting the account key. That didn't turn out to be the problem,
but I'm fixing it anyway because it will cause problems later on.
Change-Id: I0143ba824f3a5bfcd77f32828931b94d6977626f
2013-09-30 15:08:45 -07:00
Tony Mantler
b38c7d1c37
Avoid ANR due to looking up account info on the main thread
...
b/10987175
Change-Id: I7344e2717ab1b9557385eb6eb9e7962461b10c9d
2013-09-30 12:31:52 -07:00
Yu Ping Hu
3e18254326
am 125cbdf9
: Make certain we don\'t use a null account.
...
* commit '125cbdf9d4dbc30127d99b56c9c025fab70aa358':
Make certain we don't use a null account.
2013-09-29 21:16:21 -07:00
Yu Ping Hu
125cbdf9d4
Make certain we don't use a null account.
...
Bug: 10965484
Change-Id: I525d32fcbde0fbbe0bec467814cf4f09a3de38fe
2013-09-29 18:09:17 -07:00