ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
12,960 Commits 2 Branches 0 Tags 45 MiB
37139ea828
Commit Graph

12960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
37139ea828 Merge "Lovely - broke the build. Ugh !" 2014-06-27 15:56:14 +00:00
Baligh Uddin
609842f201 Lovely - broke the build. Ugh ! 
Revert "Import translations. DO NOT MERGE"

This reverts commit 47abe88ce3.

Change-Id: If1944271f1a2b5249ec0cdf02294cd56544dd81a
 2014-06-28 04:33:53 +00:00
Baligh Uddin
45f71c51a9 Merge "Import translations. DO NOT MERGE" 2014-06-26 23:44:51 +00:00
Baligh Uddin
47abe88ce3 Import translations. DO NOT MERGE 
Change-Id: I619cb06f98603fabd5f27ef37c2ad3526d0cd537
Auto-generated-cl: translation import
 2014-06-26 14:55:54 -07:00
Baligh Uddin
89ef14d6aa am 83873fcc: (-s ours) am 06f8a6b0: (-s ours) Import translations. DO NOT MERGE 
* commit '83873fcc4f15aef14ca68affe3b550042ba24eaa':
  Import translations. DO NOT MERGE
 2014-06-26 16:59:51 +00:00
Baligh Uddin
83873fcc4f am 06f8a6b0: (-s ours) Import translations. DO NOT MERGE 
* commit '06f8a6b042221f9ebe370e0a72f0462d7eb1be51':
  Import translations. DO NOT MERGE
 2014-06-26 16:54:24 +00:00
Baligh Uddin
06f8a6b042 Import translations. DO NOT MERGE 
Change-Id: I6046e493c8fe6ec54610b5b33bc12771a59df3f2
Auto-generated-cl: translation import
 2014-06-25 11:23:35 -07:00
Martin Hibdon
d5ca90b056 Add high and medium density delete icons. 
b/15749214

Change-Id: Ifc62e590b679d65c59ba08666fd0dd18a4d1fd10
 2014-06-24 14:18:03 -07:00
Android Git Automerger
028537ae04 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/packages/apps/Email 2014-06-19 20:02:34 +00:00
Martin Hibdon
dfb7488d65 Update IEmailService 
This is not yet finalized, but it's needed to fix push syncs
on exchange.

Change-Id: Iaff20aa0bdea9685ef6603de1f861d58fbab6ff1
(cherry picked from commit fb2a3a2f77)
 2014-06-18 23:35:34 +00:00
Anthony Lee
326566c9d9 Remove the wearable prebuilt from the Email makefile 
Change-Id: Ic11c3e0b5d3f8b733d0427460a124a7a73101db3
(cherry picked from commit 2a5dac19e7)
 2014-06-17 20:01:54 +00:00
Geoff Mendal
25a214858a Keep history after reset to ub-mail-master 2014-06-17 05:58:23 -07:00
Andy Huang
28543e99ab doc-centric compose 
use 'intoExisting' so repeated taps on Reply for a particular message
goes right to any in-progress compose.
use 'autoRemoveFromRecents' because nobody wants stale Compose tasks
accessible from Recents.

Change-Id: Icb39b504f51d20c8c2a11105c1af7a8b371234c4
 2014-06-16 17:32:56 -07:00
Tony Mantler
93ec28ec41 Merge "Listen for relevant shared preferences changes" into ub-mail-master 2014-06-16 15:39:47 +00:00
Tony Mantler
c8d8a8445e Listen for relevant shared preferences changes 
b/9566150

Change-Id: If6005de568330d12e2838220b815467d58276d71
 2014-06-16 13:30:25 -07:00
Greg Bullock
b71fe22a93 Null implemention of the getWelcomeTourFragment method for Email. 
Change-Id: I6e2e0917b70953f58aeed019066db118ca46fe70
 2014-06-16 21:01:27 +02:00
Geoff Mendal
14b7357c48 Empty commit to fix Launchcontrol 2014-06-13 10:12:22 -07:00
Geoff Mendal
dc2c3d2114 Keep history after reset to ub-mail-master\nBug: 15593367 2014-06-13 07:30:34 -07:00
Tony Mantler
988ad6e002 Move all general prefs values to UnifiedEmail 
b/9566150

Change-Id: Id7058586c71c3c1cc4933dc28532a02df90c29bc
 2014-06-12 16:23:52 -07:00
Alan Lau
8183be889f am 9773c96d: Return the order key in the conversation cursor. 
* commit '9773c96d83f126b8418b192bcf46f939f44fdb44':
  Return the order key in the conversation cursor.
 2014-06-12 17:11:50 +00:00
Alan Lau
9773c96d83 Return the order key in the conversation cursor. 
For Email the order key is the message timestamp, Gmail sortMessageId.  The
order key is then used as the sort key for notificatin api, and because it is
stable, notification bridger can avoid bridging duplicate notifications and
reodering the email card bundle on the watch.

Bug 15563260

Change-Id: Ie68f45de91cc42c58238b7cdc0ae828048e22a46
 2014-06-11 16:16:41 -07:00
Alan Lau
378379929e am 49dd287c: Update manifest for ag/480274 
* commit '49dd287cb0ed7c25c3690c56c78111023048a00a':
  Update manifest for ag/480274
 2014-06-11 01:02:09 +00:00
Alan Lau
49dd287cb0 Update manifest for ag/480274 
Bug 15332337
Bug 15332837
Bug 15532541

Change-Id: I92711d776ffb3b79ea3a6e491eb86b7cecceeaa0
 2014-06-10 16:30:27 -07:00
Tony Mantler
14623ba3c2 More dead code 
Change-Id: I3178d47c955b060c5d5ab1f0029347b325887fa0
 2014-06-10 15:53:23 -07:00
Tony Mantler
51af59fc66 Remove unused preferences and dead code 
Change-Id: Ica8bd735a91417ed44bd547ab7176832745d729e
 2014-06-10 11:29:17 -07:00
Tony Mantler
8b38cc1739 Merge "Make incoming settings username editable" into ub-mail-master 2014-06-10 18:09:33 +00:00
Baligh Uddin
ecfffe6b49 Merge "Import translations. DO NOT MERGE" into ub-mail-master 2014-06-10 17:13:36 +00:00
James Lemieux
97fb20697c Merge "Unit Tests for serialization of Account and HostAuth objects" into ub-mail-master 2014-06-09 23:33:17 +00:00
Tony Mantler
5da2f12dc5 Make incoming settings username editable 
And get rid of that annoying "you can't edit this" info text bubble

Change-Id: I7efc039b39be292512f25bd5470b7ae36927c8f3
 2014-06-09 16:23:57 -07:00
James Lemieux
9250f47872 Unit Tests for serialization of Account and HostAuth objects 
b/14998528

These are particularly important since they are stored in JSON form within the
Account Manager, so maintaining backward compatibility when future changes are
introduced is crucial.

Change-Id: I51333a364726a4c7e2fe88ee888e8c4cc11d962f
 2014-06-09 16:18:27 -07:00
Martin Hibdon
b1b9707b77 am a516bd82: Update email version number 
* commit 'a516bd820dcba6ce6b20e89c2167742da8dc6267':
  Update email version number
 2014-06-09 22:55:48 +00:00
Martin Hibdon
a516bd820d Update email version number 
Change-Id: Id9b77db64b9ee414c326d576ad5c92c4e789da44
 2014-06-09 15:50:52 -07:00
Tony Mantler
524e0a5fbc am 73101f3a: Fix OAuth when changing credentials from settings 
* commit '73101f3a7bc1e735199a7c2c18358e9db9af0bca':
  Fix OAuth when changing credentials from settings
 2014-06-09 22:50:37 +00:00
Tony Mantler
73101f3a7b Fix OAuth when changing credentials from settings 
b/15521401

Change-Id: I7909389943c8e3eefbef0699f1c7c9c338282ca5
(cherry picked from commit 994c282d80)
 2014-06-09 22:45:45 +00:00
Tony Mantler
994c282d80 Fix OAuth when changing credentials from settings 
b/15521401

Change-Id: I7909389943c8e3eefbef0699f1c7c9c338282ca5
 2014-06-09 15:28:11 -07:00
Baligh Uddin
fd6c63d18f Import translations. DO NOT MERGE 
Change-Id: Ide656b0a564018891e08956d553e82f14d617e29
Auto-generated-cl: translation import
 2014-06-09 13:33:23 -07:00
Baligh Uddin
c3a639ce91 Import translations. DO NOT MERGE 
Change-Id: Ie8fbca1da0cb04980f23c95b2c378e41638e9629
Auto-generated-cl: translation import
 2014-06-09 13:32:07 -07:00
Baligh Uddin
c57f443ff0 Merge "Import translations. DO NOT MERGE" 2014-06-07 04:18:57 +00:00
Baligh Uddin
0f1d3a8f11 Merge "Import translations. DO NOT MERGE" into ub-mail-master 2014-06-07 04:18:53 +00:00
The Android Automerger
8a44b92af3 am 2e8400c2: merge in master-release history after reset to 1f2c8cd7c3 
* commit '2e8400c21174af2955ca3e4cf7c8035d4a0830d7':
  Fix URI comparison
  Revert "email: add support for Server Name Indication (SNI)"
 2014-06-06 15:41:57 +00:00
Anthony Lee
11708a64a5 Merge "Some more cleanup and code rearrangement & added unit tests for ServiceCallback." into ub-mail-master 2014-06-05 23:41:56 +00:00
Anthony Lee
39e3bd63b5 Some more cleanup and code rearrangement & added unit tests 
for ServiceCallback.

Change-Id: I6017e50455df3dda9ef6ec54ffd4fbc4e9b1a2d9
 2014-06-05 14:57:44 -07:00
Tony Mantler
458c753c27 Merge "Clean up cert activity handling" into ub-mail-master 2014-06-05 21:19:15 +00:00
Martin Hibdon
6af16d627d am 5369b102: Update version number 
* commit '5369b102c7685d7e8c2ed6352ae48bc84f9283d7':
  Update version number
 2014-06-05 20:32:27 +00:00
Tony Mantler
f765f9b976 Clean up cert activity handling 
Fix re-displaying the dialog on orientation change b/5622284
Add host/port when available b/4988512
Disambiguate intent between AOSP and EmailGoogle

Change-Id: Ideeda20dfd9bd0070998ccf42d8042765866ca0e
 2014-06-05 13:21:08 -07:00
Martin Hibdon
5369b102c7 Update version number 
Change-Id: Ic18cd52ffdfe2905a7d9510f41f1331c2ef11675
 2014-06-05 13:16:45 -07:00
Greg Bullock
9909fabcc6 Switch to using automatic resource namespaces for drawables and services. 
Change-Id: If90089be6be004c87bdda5a5c3ed036a48205229
 2014-06-05 17:25:51 +02:00
Martin Hibdon
43ab1020f1 Merge "Delete obsolete code" into ub-mail-master 2014-06-04 21:00:29 +00:00
Baligh Uddin
507d5fe12b Import translations. DO NOT MERGE 
Change-Id: I41875186f162d7a1d458cf662aeb5aade4197845
Auto-generated-cl: translation import
 2014-06-04 13:18:16 -07:00
Baligh Uddin
b0b17a20b0 Import translations. DO NOT MERGE 
Change-Id: Ic6f144c604e25d07419b30bfebedde698aefcff9
Auto-generated-cl: translation import
 2014-06-04 13:16:50 -07:00