Commit Graph

10133 Commits

Author SHA1 Message Date
Baligh Uddin 050327247b Merge "Import translations. DO NOT MERGE" into ub-mail-algol 2014-04-08 02:22:53 +00:00
Baligh Uddin 9651716041 Merge "Import translations. DO NOT MERGE" into ub-mail-master 2014-04-08 02:22:47 +00:00
Tony Mantler fdc8a744b5 am 142f12ea: Merge "Fix IMAP attachment upsync for forwarded messages" into ub-mail-algol
* commit '142f12ea934444e8ecd0a06be4aeb56439546e13':
  Fix IMAP attachment upsync for forwarded messages
2014-04-07 23:57:48 +00:00
Tony Mantler 142f12ea93 Merge "Fix IMAP attachment upsync for forwarded messages" into ub-mail-algol 2014-04-07 23:54:32 +00:00
Tony Mantler 84dfa15541 Fix IMAP attachment upsync for forwarded messages
b/13883967

Change-Id: I496663144c41fa6353883bb77fa35fb14d1cfa07
2014-04-07 16:26:04 -07:00
Martin Hibdon e48195bfdc am 94acc8e4: Merge "Fix the names of the save state contants" into ub-mail-algol
* commit '94acc8e485dc5fbcd6cf11104a9f2ac9c14f62e5':
  Fix the names of the save state contants
2014-04-07 23:21:16 +00:00
Martin Hibdon 426a953479 am 763bd628: update email version
* commit '763bd628d755bad493b0961cdec8d7e39b56ffe1':
  update email version
2014-04-07 23:21:15 +00:00
Martin Hibdon 94acc8e485 Merge "Fix the names of the save state contants" into ub-mail-algol 2014-04-07 23:17:45 +00:00
Martin Hibdon 763bd628d7 update email version
Change-Id: Id93dac8ad7b94fe3cff1e8a015b100b2c9f9c0b0
2014-04-07 15:57:43 -07:00
Martin Hibdon 2eb7f1babc Fix the names of the save state contants
b/13624066

Change-Id: I0fabcfbf659e51de3dfe2fc9b72bd88f86e576a6
2014-04-07 15:36:53 -07:00
Scott Kennedy 80444f0d26 Merge "Don't assume ComposeActivity's class name won't change" into ub-mail-master 2014-04-07 21:49:43 +00:00
Scott Kennedy ed659b0b11 Don't assume ComposeActivity's class name won't change
Instead, use a generic intent action that will just launch whichever
ComposeActivity the current app needs.

Change-Id: Iaefed106107bef7bd1f9d5086800862ceb42c009
2014-04-07 14:31:21 -07:00
Martin Hibdon 268b75f818 am a8474c52: Merge "Save and restore sync interval values and strings" into ub-mail-algol
* commit 'a8474c5273f9cfd5e9e4750f9ab9af94f3894635':
  Save and restore sync interval values and strings
2014-04-07 21:14:12 +00:00
Martin Hibdon a8474c5273 Merge "Save and restore sync interval values and strings" into ub-mail-algol 2014-04-07 21:08:29 +00:00
Martin Hibdon ddcb95f0e7 Save and restore sync interval values and strings
b/13624066

Change-Id: I14c243a7f7ae71e5d6fbdedda328dc01bb2eae85
2014-04-07 13:30:58 -07:00
Baligh Uddin fb334eb5cb Import translations. DO NOT MERGE
Change-Id: I8db8bde4cc35a52217b23212ef5f55c94a3278e7
Auto-generated-cl: translation import
2014-04-07 13:13:33 -07:00
Baligh Uddin 74826a68db Import translations. DO NOT MERGE
Change-Id: I96985f3384c3dd652a1facf74d0750a061569deb
Auto-generated-cl: translation import
2014-04-07 13:11:26 -07:00
Tony Mantler 2f638fb4f5 am 021fb3cd: More layout tweaks
* commit '021fb3cd78f5ef458fcb3203a7c0c8fd32a540fa':
  More layout tweaks
2014-04-07 18:46:49 +00:00
Tony Mantler 021fb3cd78 More layout tweaks
b/13640507

Change-Id: I0392671df101e263aba89abc8b949fe906f34ed0
2014-04-07 11:37:37 -07:00
Tony Mantler b09dd77d95 am 6cbdd5bb: Fix more IME actions
* commit '6cbdd5bba0c9c68a3261e54b1cebff48459657d5':
  Fix more IME actions
2014-04-07 16:30:50 +00:00
Tony Mantler 6cbdd5bba0 Fix more IME actions
b/13544189

Change-Id: I5dbbf45a1b68cac2d63ba41c70daff9d33cbb492
2014-04-04 16:36:06 -07:00
Tony Mantler 4c0c00f3e4 am d1a48cb5: Merge "Fix IME actions for Names screen on setup flow" into ub-mail-algol
* commit 'd1a48cb5f4cb300677ef62a3cf64a4324d9516aa':
  Fix IME actions for Names screen on setup flow
2014-04-04 23:18:25 +00:00
Tony Mantler df2fe89e81 am c9df9390: Make "Manual setup" underlined
* commit 'c9df939011dbb54278afc32f5b4c0fabe940e0d3':
  Make "Manual setup" underlined
2014-04-04 23:18:25 +00:00
Tony Mantler d1a48cb5f4 Merge "Fix IME actions for Names screen on setup flow" into ub-mail-algol 2014-04-04 23:12:55 +00:00
Tony Mantler 36da789bc2 Fix IME actions for Names screen on setup flow
b/13544189

Change-Id: I251c28918c899b8237c6eee3bc3f0beface00a38
2014-04-04 15:56:38 -07:00
Tony Mantler c9df939011 Make "Manual setup" underlined
That was easier than expected.

b/13814534

Change-Id: I288dc04a91d98800ec351cf1a6ad642755947925
2014-04-04 15:35:52 -07:00
Martin Hibdon 2dfa5cdf3f am 47752716: Merge "Fix a crash signing in with oauth" into ub-mail-algol
* commit '4775271611401a4d9b0c495e7ffe09fffbc1633d':
  Fix a crash signing in with oauth
2014-04-04 22:03:51 +00:00
Martin Hibdon 4775271611 Merge "Fix a crash signing in with oauth" into ub-mail-algol 2014-04-04 21:59:06 +00:00
Martin Hibdon 3144149f73 Fix a crash signing in with oauth
b/13753410

Change-Id: Ie5909b3db9263d261a422e8fe39e424180f326b9
2014-04-04 14:55:13 -07:00
Tony Mantler d08361e7a5 am 12890669: Prevent the IME from popping up when launching setup flow
* commit '12890669c3ef5eed35aae4478928aad8a9d2e8b2':
  Prevent the IME from popping up when launching setup flow
2014-04-04 21:04:19 +00:00
Tony Mantler 12890669c3 Prevent the IME from popping up when launching setup flow
b/13769774

Change-Id: I184f577cf40d0f43adcceee6ca9bede77f37d4d0
2014-04-04 13:48:42 -07:00
Tony Mantler 1baa2e5324 am a0617312: Merge "More "Manual Setup" button tweaks" into ub-mail-algol
* commit 'a061731281bd437aaec9b7f327b28cd3c246026f':
  More "Manual Setup" button tweaks
2014-04-04 17:48:43 +00:00
Tony Mantler a061731281 Merge "More "Manual Setup" button tweaks" into ub-mail-algol 2014-04-04 17:43:03 +00:00
Tony Mantler a67a905542 More "Manual Setup" button tweaks
b/13750692

Change-Id: I8e4c7cc1cb74af16998ec26aae506d30735ed068
2014-04-04 10:10:25 -07:00
Baligh Uddin d3b77e2a91 am 79c3cf9e: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-mail-algol
* commit '79c3cf9e0e214cb721f86358f8daaeb2690ceb5d':
  Import translations. DO NOT MERGE
2014-04-04 14:43:24 +00:00
Baligh Uddin 79c3cf9e0e Merge "Import translations. DO NOT MERGE" into ub-mail-algol 2014-04-04 14:38:26 +00:00
Baligh Uddin a11fc6afd3 Merge "Import translations. DO NOT MERGE" into ub-mail-master 2014-04-04 14:38:16 +00:00
Martin Hibdon 0ab326edb4 am 8e456537: Merge "Bound the number of headers we might try to fetch" into ub-mail-algol
* commit '8e456537523966bb72b7cac66b3cb7ec04922562':
  Bound the number of headers we might try to fetch
2014-04-03 21:47:59 +00:00
Martin Hibdon ec454e092e am 44a443b4: Merge "Make oauth error handling localizable" into ub-mail-algol
* commit '44a443b4e35f68a38ee73b1ce959302b0b3e74b6':
  Make oauth error handling localizable
2014-04-03 21:47:58 +00:00
Martin Hibdon 8e45653752 Merge "Bound the number of headers we might try to fetch" into ub-mail-algol 2014-04-03 21:45:08 +00:00
Martin Hibdon 44a443b4e3 Merge "Make oauth error handling localizable" into ub-mail-algol 2014-04-03 21:44:59 +00:00
Martin Hibdon 8cb95732b0 Make oauth error handling localizable
Also, add some logging to track down b/13545303

Change-Id: I44a0d63b5c3b53018b48eb1c58d6a9ff74bddd9c
2014-04-03 14:28:50 -07:00
Martin Hibdon 7ea823327f Bound the number of headers we might try to fetch
b/13545303
Prior to this change, there is no bound on the number of message
headers we might try to fetch at the same time. Now, we fetch
headers in chunks of limited size.

Change-Id: I06db96eefa8732f970c31fc3617480de40723f2d
2014-04-03 14:23:47 -07:00
Martin Hibdon 373ced47a5 am 7d7f12dc: Merge "Update version" into ub-mail-algol
* commit '7d7f12dc54a53f4a5d8ac4f7b63ca3dfdcd0966d':
  Update version
2014-04-03 00:29:30 +00:00
Martin Hibdon 7d7f12dc54 Merge "Update version" into ub-mail-algol 2014-04-03 00:24:04 +00:00
Martin Hibdon 7778956995 Update version
Change-Id: I394acd95fa6d4fcca0858c7e72f78d5f6f46f705
2014-04-02 17:19:17 -07:00
Anthony Lee 406c87d852 am e453e7dd: Merge "b/13734162. Make sure that SmartForward is enabled on EAS accounts." into ub-mail-algol
* commit 'e453e7dd29aa5b051cca18670f25e139fb784350':
  b/13734162. Make sure that SmartForward is enabled on EAS accounts.
2014-04-02 23:31:57 +00:00
Tony Mantler d12032bd09 am 4c6338bf: Make sure HostAuths are populated on manual setup
* commit '4c6338bf1a87fa2829ff788d6493f31e952905aa':
  Make sure HostAuths are populated on manual setup
2014-04-02 23:31:56 +00:00
Tony Mantler cbc3d6abbc am 68da1ad7: Merge "Add missing call to super.onSaveInstanceState()" into ub-mail-algol
* commit '68da1ad73fcc19efec7b5ef2f3fcd67de19d0d68':
  Add missing call to super.onSaveInstanceState()
2014-04-02 23:31:55 +00:00
Tony Mantler 88ef9a6ce2 am 0976275d: Merge "Change \'Manual setup\' into clickable text instead of a checkbox" into ub-mail-algol
* commit '0976275d7a4854d90d943c50a10d37db2e7f5ece':
  Change 'Manual setup' into clickable text instead of a checkbox
2014-04-02 23:31:55 +00:00