Baligh Uddin
bb6b522ab0
am 7b7b0a63: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
...
* commit '7b7b0a631082157bbf79aaa1a8f1da5c51eb22dc':
Import translations. DO NOT MERGE
2013-09-25 21:46:15 -07:00
Baligh Uddin
ee96c04e3c
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11
2013-09-26 04:43:45 +00:00
Baligh Uddin
7b7b0a6310
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
2013-09-26 04:43:40 +00:00
Baligh Uddin
3dc6c400f7
Import translations. DO NOT MERGE
...
Change-Id: Ia0d0366634e3775305f6cbe85b1af75c8e4c5450
Auto-generated-cl: translation import
2013-09-25 21:41:26 -07:00
Baligh Uddin
f46480240f
Import translations. DO NOT MERGE
...
Change-Id: I4b6d3fa170aa039f4101da8b85cd682aa029854b
Auto-generated-cl: translation import
2013-09-25 21:40:53 -07:00
Yu Ping Hu
e68180302c
am 88f472f5: Merge "Fix string for quick response editing." into jb-ub-mail-ur10
...
* commit '88f472f53e5a4d9df8c328ec1505e1719dd1b9cb':
Fix string for quick response editing.
2013-09-25 16:44:27 -07:00
Yu Ping Hu
88f472f53e
Merge "Fix string for quick response editing." into jb-ub-mail-ur10
2013-09-25 23:42:07 +00:00
Yu Ping Hu
e2e9c846e9
Fix string for quick response editing.
...
Bug: 10793424
Change-Id: I3b04f8680b5a2764a17e3adec3a16b512a8e98d9
2013-09-25 16:14:08 -07:00
Martin Hibdon
2e0a627ac0
am bf49e995: Merge "Move calendar and contacts to the new account on upgrade" into jb-ub-mail-ur10
...
* commit 'bf49e995690053c8fc9dacc1e50de4e525aec269':
Move calendar and contacts to the new account on upgrade
2013-09-25 15:16:56 -07:00
Martin Hibdon
bf49e99569
Merge "Move calendar and contacts to the new account on upgrade" into jb-ub-mail-ur10
2013-09-25 22:15:22 +00:00
Tony Mantler
b5d2f499d4
am bc565347: Merge "Separate the account name from the account manager\'s account name" into jb-ub-mail-ur10
...
* commit 'bc5653471c11d8d2678c22bda8b6ae33e65650a1':
Separate the account name from the account manager's account name
2013-09-25 15:13:39 -07:00
Tony Mantler
bc5653471c
Merge "Separate the account name from the account manager's account name" into jb-ub-mail-ur10
2013-09-25 22:10:56 +00:00
Yu Ping Hu
e69466d62a
am 229e1730: Merge "Disable account setup debug screen." into jb-ub-mail-ur10
...
* commit '229e173010be54924fb6b9ff0c41151abaeb849a':
Disable account setup debug screen.
2013-09-25 14:58:17 -07:00
Yu Ping Hu
229e173010
Merge "Disable account setup debug screen." into jb-ub-mail-ur10
2013-09-25 21:56:15 +00:00
Tony Mantler
19b8f0e8a2
am 1082ed94: Merge "Match against both account name and type when reconciling accounts" into jb-ub-mail-ur10
...
* commit '1082ed94305de70f40320b0fd181d2f0328b8cfe':
Match against both account name and type when reconciling accounts
2013-09-25 14:26:00 -07:00
Tony Mantler
85b0bc9e62
am 5757047f: Merge "Make sure the account check dialog doesn\'t outlive the account check fragment" into jb-ub-mail-ur10
...
* commit '5757047f339fd9d17d039e81e0eeee455e729834':
Make sure the account check dialog doesn't outlive the account check fragment
2013-09-25 14:25:59 -07:00
Tony Mantler
08a243ddbb
am d17359c2: Notify on message Uri when a message is deleted.
...
* commit 'd17359c2b4e39baa426c7bce09f1a5d293378c77':
Notify on message Uri when a message is deleted.
2013-09-25 14:25:54 -07:00
Tony Mantler
1082ed9430
Merge "Match against both account name and type when reconciling accounts" into jb-ub-mail-ur10
2013-09-25 21:24:52 +00:00
Tony Mantler
5757047f33
Merge "Make sure the account check dialog doesn't outlive the account check fragment" into jb-ub-mail-ur10
2013-09-25 21:24:35 +00:00
Tony Mantler
ed0ee50a12
Match against both account name and type when reconciling accounts
...
b/10210901
Change-Id: Ice60ab64a2f7287be9ee639e5777f85bda4bd390
2013-09-25 13:34:04 -07:00
Tony Mantler
d8ee809ac2
Make sure the account check dialog doesn't outlive the account check fragment
...
b/10918608
Change-Id: I65725b8935b2902ff926ba333cd41a3c1545f332
2013-09-25 11:24:55 -07:00
Tony Mantler
d17359c2b4
Notify on message Uri when a message is deleted.
...
b/10919322
Change-Id: I0b39bcbc2e03c45fc0c161211c7cdacd97791c15
2013-09-25 10:09:01 -07:00
Martin Hibdon
3aad3fcb8b
Move calendar and contacts to the new account on upgrade
...
b/10805685
Change-Id: I08de135f166ad10812c9318efe649694e5c448d0
2013-09-24 17:02:08 -07:00
Tony Mantler
7349fbff64
Separate the account name from the account manager's account name
...
b/10894178
Change-Id: Ie64ae00e4fd382fb03fc7c87ea91c7aff8fc8f43
2013-09-24 16:41:50 -07:00
Baligh Uddin
d258de724e
am 99b02335: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
...
* commit '99b023353dc253a4a1ca13ef866d88d95dd8a829':
Import translations. DO NOT MERGE
2013-09-24 15:07:22 -07:00
Baligh Uddin
0b2fcb972e
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur11
2013-09-24 22:04:36 +00:00
Baligh Uddin
99b023353d
Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
2013-09-24 22:04:33 +00:00
Tony Mantler
2d8cc3de3d
am bab16f91: Merge "Virtual folders are valid folders, don\'t kick back to the inbox when we\'re viewing them" into jb-ub-mail-ur10
...
* commit 'bab16f9161edb940f8a612846a2ff4ac50ffc58d':
Virtual folders are valid folders, don't kick back to the inbox when we're viewing them
2013-09-24 12:03:24 -07:00
Tony Mantler
bab16f9161
Merge "Virtual folders are valid folders, don't kick back to the inbox when we're viewing them" into jb-ub-mail-ur10
2013-09-24 18:58:43 +00:00
Tony Mantler
96192ef342
Virtual folders are valid folders, don't kick back to the inbox when we're viewing them
...
b/10847930
Change-Id: I182fee7d6caa5c4a67911c0c8e969d8668ac87d0
2013-09-24 11:42:21 -07:00
Tony Mantler
0deee4f88c
am 4f32213e: Missing part of I27ad5ee75df669315e03c9ccc299bfc8eacbb53b
...
* commit '4f32213ebebb59d5316e0dd4ca9d78dc1c170879':
Missing part of I27ad5ee75df669315e03c9ccc299bfc8eacbb53b
2013-09-24 11:34:01 -07:00
Tony Mantler
4f32213ebe
Missing part of I27ad5ee75df669315e03c9ccc299bfc8eacbb53b
...
Change-Id: I207898b4f6f9148758d4ee1c6a82cbb387570240
2013-09-24 11:25:36 -07:00
Tony Mantler
b7a6280da6
am e54d6957: Clear out erroneous sync values for IMAP mailboxes on upgrade
...
* commit 'e54d6957dbbd14d35a1858cb02959fd8f9bb0d37':
Clear out erroneous sync values for IMAP mailboxes on upgrade
2013-09-24 11:15:42 -07:00
Tony Mantler
e54d6957db
Clear out erroneous sync values for IMAP mailboxes on upgrade
...
b/10695945
Change-Id: Ic68c9ef0baa25eae40631184cf0322ff26c9e5ab
2013-09-24 11:08:33 -07:00
Martin Hibdon
ce34d8fd7d
am 1290f376: Merge "Improve display of attachments in pop" into jb-ub-mail-ur10
...
* commit '1290f376c09749988d71e1a00179fe249a88be3b':
Improve display of attachments in pop
2013-09-23 21:16:09 -07:00
Martin Hibdon
1290f376c0
Merge "Improve display of attachments in pop" into jb-ub-mail-ur10
2013-09-24 04:14:18 +00:00
Yu Ping Hu
9ecf8e27d4
am ab30caf3: Merge "Increment Email version." into jb-ub-mail-ur10
...
* commit 'ab30caf37e59fce73f97c5f1efc2633bb582f746':
Increment Email version.
2013-09-23 15:49:30 -07:00
Yu Ping Hu
ab30caf37e
Merge "Increment Email version." into jb-ub-mail-ur10
2013-09-23 22:47:45 +00:00
Baligh Uddin
5b7fa95508
Import translations. DO NOT MERGE
...
Change-Id: I467cd4f65f68d103fa5ac474bd22d0b7c039450c
Auto-generated-cl: translation import
2013-09-23 15:03:33 -07:00
Baligh Uddin
c002411556
Import translations. DO NOT MERGE
...
Change-Id: I5a82dfe507791f9d2d8a26b063a824196907d4ff
Auto-generated-cl: translation import
2013-09-23 15:02:58 -07:00
Scott Kennedy
09f6026a00
am 0203a06c: Ensure we have all columns in combined view
...
* commit '0203a06c87e389f0d3af19bc26f61d0cf846226a':
Ensure we have all columns in combined view
2013-09-23 14:58:14 -07:00
Scott Kennedy
0203a06c87
Ensure we have all columns in combined view
...
I added these to real mailboxes for hierarchical folders, but we
also need them in combined view.
Bug: 10891994
Change-Id: Iaa291fb9a9cd6039fb4d347309ce3a37aa64392a
2013-09-23 14:08:36 -07:00
Yu Ping Hu
ac2bf2ffe4
Increment Email version.
...
Change-Id: I416af3e042169fbeb68d2e30d3d5f76684d19784
2013-09-23 13:57:37 -07:00
Martin Hibdon
aad690f699
Improve display of attachments in pop
...
b/10714298
This is related to this CL in UnifiedEmail
https://googleplex-android-review.git.corp.google.com/#/c/363626/1
Change-Id: Idea2827791ed52e7558b11aaea07b1f3f1764db5
2013-09-20 17:39:05 -07:00
Scott Kennedy
569dbd5b3c
am bba11cde: Merge "Hierarchical folders in conversation list" into jb-ub-mail-ur10
...
* commit 'bba11cdec97299417dc5686465ed6beeaf4d1d47':
Hierarchical folders in conversation list
2013-09-20 16:01:07 -07:00
Scott Kennedy
bba11cdec9
Merge "Hierarchical folders in conversation list" into jb-ub-mail-ur10
2013-09-20 22:59:28 +00:00
Scott Kennedy
fc5aae98e7
Hierarchical folders in conversation list
...
Use something similar to the sectioned inbox teaser.
This change allows displaying sender snippets in the teaser.
Bug: 9604590
Change-Id: Ib27f002ab8cbd2315d95d46eeb1735aa6b594db5
2013-09-20 17:46:27 -04:00
Tony Mantler
521ee84fb9
am ab4eadaf: Merge "Fake syncing while we\'re waiting for the sync to start" into jb-ub-mail-ur10
...
* commit 'ab4eadaf4d51bfd44d504f55595e7aaba881de6c':
Fake syncing while we're waiting for the sync to start
2013-09-19 16:05:50 -07:00
Tony Mantler
ab4eadaf4d
Merge "Fake syncing while we're waiting for the sync to start" into jb-ub-mail-ur10
2013-09-19 23:04:24 +00:00
Baligh Uddin
e1b2af02a0
am d8951728: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-ub-mail-ur10
...
* commit 'd89517287493418f3319e94dc4b01408305a7451':
Import translations. DO NOT MERGE
2013-09-19 14:57:28 -07:00
