Commit Graph

12982 Commits

Author SHA1 Message Date
Tony Mantler
c9480bef94 am 6f747eb7: Unify general settings
* commit '6f747eb77616d7f9949997d7e5a47414534a355a':
  Unify general settings
2014-07-16 19:17:14 +00:00
Anthony Lee
9528508399 am 2a5dac19: Remove the wearable prebuilt from the Email makefile
* commit '2a5dac19e7d1f398d0b1b7b22055b2a65a072c46':
  Remove the wearable prebuilt from the Email makefile
2014-07-16 19:17:13 +00:00
Paul Westbrook
18ffb4a2c4 am e817be13: Specify compose activity with resource.
* commit 'e817be135332c4060b5985ff830e3ce555043a43':
  Specify compose activity with resource.
2014-07-16 19:17:12 +00:00
Paul Westbrook
4713567c1a am 57dbc3bf: Remove proguard config for removed class
* commit '57dbc3bf028008f9d23c2caa7908bcf4f4bfb3f7':
  Remove proguard config for removed class
2014-07-16 19:17:11 +00:00
Baligh Uddin
cca7fdf862 Merge "Fix submitted - retrying." 2014-07-06 02:28:07 +00:00
Baligh Uddin
94f3febce1 Fix submitted - retrying.
Revert "Broke the build."

This reverts commit a4a1319cf3.

Change-Id: Ic3fb982da84b9dde34e550efaaf67450c1f460d2
2014-07-07 03:07:46 +00:00
Andrew Sapperstein
373e846d29 Fix build.
Change-Id: Ie51274cb9eaf154dfc41c86b40845028b0993610
(cherry picked from commit 99e836097b)
2014-07-07 03:02:39 +00:00
Baligh Uddin
96475ad940 am 8c0c1c0e: (-s ours) am ab8aa373: (-s ours) am c6e040c7: (-s ours) am 19019ae6: (-s ours) Import translations. DO NOT MERGE
* commit '8c0c1c0ed6aadc4c8179e748c7d171138fd3ffc9':
  Import translations. DO NOT MERGE
2014-07-06 22:04:00 +00:00
Baligh Uddin
a4a1319cf3 Broke the build.
Revert "Import translations. DO NOT MERGE"

This reverts commit 79f485a9a6.

Change-Id: Ibf35a432958a5bad17a8668ee8a51cc5b0ed84a4
2014-07-06 22:02:03 +00:00
Baligh Uddin
8c0c1c0ed6 am ab8aa373: (-s ours) am c6e040c7: (-s ours) am 19019ae6: (-s ours) Import translations. DO NOT MERGE
* commit 'ab8aa37396f9d8f855aa3b7a52db0f828528e03b':
  Import translations. DO NOT MERGE
2014-07-06 21:57:18 +00:00
Baligh Uddin
ab8aa37396 am c6e040c7: (-s ours) am 19019ae6: (-s ours) Import translations. DO NOT MERGE
* commit 'c6e040c7beb2df51cf63e91b7a3eef9888900ec5':
  Import translations. DO NOT MERGE
2014-07-06 21:52:46 +00:00
Baligh Uddin
2999eed5f8 am a6cb9375: (-s ours) Import translations. DO NOT MERGE
* commit 'a6cb9375f5bca73a9aa70957aa0687ee02ef2ecd':
  Import translations. DO NOT MERGE
2014-07-06 21:49:27 +00:00
Baligh Uddin
c6e040c7be am 19019ae6: (-s ours) Import translations. DO NOT MERGE
* commit '19019ae6942121ed33203b2e355730af08f7c31e':
  Import translations. DO NOT MERGE
2014-07-06 21:46:35 +00:00
Baligh Uddin
79f485a9a6 Import translations. DO NOT MERGE
Change-Id: I5d36b89f02b11744ec5373d9b672f7fa8106c62f
Auto-generated-cl: translation import
2014-07-06 11:06:16 -07:00
Baligh Uddin
a6cb9375f5 Import translations. DO NOT MERGE
Change-Id: Id6669b5dc0915b838273ac47c57b13db88f8c7e6
Auto-generated-cl: translation import
2014-07-06 10:57:46 -07:00
Baligh Uddin
19019ae694 Import translations. DO NOT MERGE
Change-Id: I97a1fb94befee6929e63648440a67518c4bc82bb
Auto-generated-cl: translation import
2014-07-06 10:56:15 -07:00
Baligh Uddin
61b5b3edbc Merge "Broke the build." 2014-07-02 18:17:00 +00:00
Baligh Uddin
72522b5461 am 2999eed5: (-s ours) am a6cb9375: (-s ours) Import translations. DO NOT MERGE
* commit '2999eed5f8d6c7ca1775d06dc2f52ceff9211640':
  Import translations. DO NOT MERGE
2014-07-06 21:56:07 +00:00
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
Tony Mantler
6f747eb776 Unify general settings
Make Email GeneralPreferences subclass GeneralPrefsFragment.

Only contains a minimum of code to strip out archive-related prefs,
which are not relevant to the current state of Email back-ends.

(These actions could be relevant for Gmail IMAP extensions if support is added for them)

b/9566150

Change-Id: Ie8e26379ed504c7d96c2a2f8e1c843bbe0582cc7
2014-06-17 13:24:20 -07: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
Anthony Lee
2a5dac19e7 Remove the wearable prebuilt from the Email makefile
Change-Id: Ic11c3e0b5d3f8b733d0427460a124a7a73101db3
2014-06-17 11:01:22 -07:00
Paul Westbrook
e817be1353 Specify compose activity with resource.
Allow the compose activity, that the account reconciler attempts
to enabled/disable, to be able to be specified via resources.

This allows the various build targets to change the activity that is
enabled/disabled, or to not attempt to do this at all

Change-Id: I7c91c2c179316a3aac910a38d7dd0025076b085a
2014-06-17 15:47:33 +02:00
Geoff Mendal
25a214858a Keep history after reset to ub-mail-master 2014-06-17 05:58:23 -07:00
Paul Westbrook
57dbc3bf02 Remove proguard config for removed class
Change-Id: Ic926aa18d6d8a889c20c7f850a200774188ad422
2014-06-17 01:37:43 -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