Tony Mantler
5c29e2c801
am 805bc397: Merge "Populate the snippet in ConversationInfo" into jb-ub-mail-ur10
...
* commit '805bc397bd9db8ef42c7aa88b9913565ac908732':
Populate the snippet in ConversationInfo
2013-10-08 09:24:24 -07:00
Tony Mantler
805bc397bd
Merge "Populate the snippet in ConversationInfo" into jb-ub-mail-ur10
2013-10-08 16:22:58 +00:00
Tony Mantler
b62486b019
Populate the snippet in ConversationInfo
...
b/11111973
Change-Id: I8a4e824ad4c708fba8013221279a0b1ac6df7a8c
2013-10-07 16:50:55 -07:00
Yu Ping Hu
377908ef63
am 6a73a79f: Merge "Increment Email version." into jb-ub-mail-ur10
...
* commit '6a73a79f081e1f3cb36c993a6d6b600211315dae':
Increment Email version.
2013-10-07 16:18:08 -07:00
Yu Ping Hu
6a73a79f08
Merge "Increment Email version." into jb-ub-mail-ur10
2013-10-07 23:15:36 +00:00
Yu Ping Hu
45ab7a9211
Increment Email version.
...
Change-Id: Id6264a1b67c4fd4cfce4461749763002136e3abe
2013-10-07 16:01:41 -07:00
Tony Mantler
9d3ffc2c4a
am 5d47ee0f: Store the total count of search results in the database only
...
* commit '5d47ee0f87208ab22c317abc87f615b6254cc852':
Store the total count of search results in the database only
2013-10-07 15:10:14 -07:00
Tony Mantler
5d47ee0f87
Store the total count of search results in the database only
...
b/11027351
Change-Id: Ibb63bd7b80ff0af653cca4424dd2d17168262710
2013-10-07 14:40:14 -07:00
Yu Ping Hu
410a72e608
am 9ac77cc3: Increment Email version.
...
* commit '9ac77cc31ee81d8efdff2e75d594735f8d1a75d7':
Increment Email version.
2013-10-04 16:17:45 -07:00
Yu Ping Hu
9ac77cc31e
Increment Email version.
...
Change-Id: I65136837b10931b3c542206959af07a11b780b8f
2013-10-04 16:14:36 -07:00
Martin Hibdon
e3744f4c05
am 6700000a: On initial sync, do inbox first
...
* commit '6700000ad14145637a482679d5c1436885ac0a16':
On initial sync, do inbox first
2013-10-04 16:07:32 -07:00
Martin Hibdon
6700000ad1
On initial sync, do inbox first
...
b/11081520
This improves perceived performance, the inbox
messages will come in before contacts and calendar
Change-Id: Icd9630d9cd2fb79a54d0ed2c11702a1a3091ed7e
2013-10-04 16:01:10 -07:00
Yu Ping Hu
261cbe12b3
am cae08a64: Fix my query. Again. :(
...
* commit 'cae08a64fb154b091f43595b9a5ab08474bd67fb':
Fix my query. Again. :(
2013-10-04 15:06:52 -07:00
Yu Ping Hu
cae08a64fb
Fix my query. Again. :(
...
Change-Id: I2453bd3daa00f16cecdec8da93b21b98ae8d5e7b
2013-10-04 15:02:28 -07:00
Yu Ping Hu
7d7d86171f
am 12700853: Merge "Fix a sql statement." into jb-ub-mail-ur10
...
* commit '12700853aba17547fe21df5b30cb4daccff69909':
Fix a sql statement.
2013-10-04 14:56:41 -07:00
Yu Ping Hu
12700853ab
Merge "Fix a sql statement." into jb-ub-mail-ur10
2013-10-04 21:55:00 +00:00
Yu Ping Hu
29984af2b2
Fix a sql statement.
...
Change-Id: I32cb6f5e52173059b08a83cbf65c9e4ac31302b4
2013-10-04 14:53:42 -07:00
Yu Ping Hu
a5b23c0f25
am 12650115: Merge "Don\'t push things that haven\'t performed initial sync." into jb-ub-mail-ur10
...
* commit '12650115857424428282d7e0fad195397e51128d':
Don't push things that haven't performed initial sync.
2013-10-04 14:43:24 -07:00
Yu Ping Hu
1265011585
Merge "Don't push things that haven't performed initial sync." into jb-ub-mail-ur10
2013-10-04 21:41:13 +00:00
Yu Ping Hu
3f24a9e2c7
Don't push things that haven't performed initial sync.
...
Also remove the ping kick.
Bug: 11081520
Change-Id: I21d5050886b2c352771013f4f3e5b9282482d508
2013-10-04 14:36:43 -07:00
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
