Commit Graph

7263 Commits

Author SHA1 Message Date
The Android Open Source Project
9a1ffd65d4 Reconcile with ics-mr1-release
Change-Id: Ia892bd8ec2198a37c8cfd79daafd8873a365c0af
2012-02-16 10:02:57 -08:00
Marc Blank
d57e096b2c This time for sure!
Change-Id: I98a0a8dcc37f52ac29d87379a886c9ca966e923c
2012-02-15 13:32:41 -08:00
Marc Blank
abad2efba8 Oops! Handle subfolders query.
Change-Id: I62628fb8bdb25b96f023788271508d65fd8b4cdd
2012-02-15 13:26:12 -08:00
Marc Blank
1e138516eb Handle query for subfolders from UIProvider
Change-Id: Ic448324a5a87b6679978426ec639fe4c3d8d77d7
2012-02-15 11:27:26 -08:00
Marc Blank
c0272961e1 Return only top-level email folders for uiFolders query
Change-Id: I9480f8263ded7d1eb3eaecc92564130b498a558d
2012-02-14 19:36:07 -08:00
The Android Automerger
a75fc4b8eb merge in ics-mr1-release history after reset to ics-mr1 2012-02-14 14:16:31 -08:00
Marc Blank
124c3e7909 am 14c0e440: Merge "Start of IMAP conversion to Service architecture"
* commit '14c0e440881852f698dcdd546c8d2e1b998a0d21':
  Start of IMAP conversion to Service architecture
2012-02-13 17:02:01 -08:00
Marc Blank
14c0e44088 Merge "Start of IMAP conversion to Service architecture" 2012-02-13 17:00:09 -08:00
Paul Westbrook
57cd0e7a93 am d9ce667c: Merge "Mark the name of the app not translatable"
* commit 'd9ce667c6b5b9f1810e2ec0aa0da352a10c2e36b':
  Mark the name of the app not translatable
2012-02-13 14:34:24 -08:00
Paul Westbrook
d9ce667c6b Merge "Mark the name of the app not translatable" 2012-02-13 14:31:44 -08:00
Eric Fischer
c4bd050c7d am 7a1cedbe: Import translations.
* commit '7a1cedbe1f7eadeeaea9f2cb770bb7d16ec04e63':
  Import translations.
2012-02-13 14:25:40 -08:00
Paul Westbrook
cbdff168b3 Mark the name of the app not translatable
Bug: 6006118

Change-Id: I308d166778999e65d3021a37d999083866136578
2012-02-13 14:09:49 -08:00
Eric Fischer
7a1cedbe1f Import translations.
Change-Id: I7fc85bdd9a77151149a87f794b1c0b1e1f9d0444
2012-02-13 12:19:01 -08:00
Eric Fischer
c9f67293fb Import translations. DO NOT MERGE
Change-Id: Ib978910ed61a0ac9cc255103e2c078b6b8bf72af
2012-02-13 12:17:23 -08:00
Marc Blank
c84467afe1 Start of IMAP conversion to Service architecture
* Handle startSync and loadMore
* Use SyncManager rather than MailService for periodic sync
  and upload sync
* First of many CL's to disentangle sync from UI
* Note that the large majority of this CL is a refactoring
  of IMAP specific code out of MessagingController and into
  ImapService; MessagingController will eventually be
  removed entirely from the app, as will much of Controller

Change-Id: I13546d0694479b33cf93c25920dedc1d38227f6c
2012-02-13 11:04:56 -08:00
Marc Blank
42e43867e6 am 80535ef3: Merge "Add folder list to conversation list fields in query"
* commit '80535ef38cd3b1edb64e85efce44bd67751427e6':
  Add folder list to conversation list fields in query
2012-02-13 10:50:53 -08:00
Marc Blank
80535ef38c Merge "Add folder list to conversation list fields in query" 2012-02-13 10:47:48 -08:00
Marc Blank
69d952c3de Add folder list to conversation list fields in query
Change-Id: Ieea84693196796175a1bdea8ecd3dbdf4a229c66
2012-02-13 10:46:24 -08:00
Eric Fischer
176b9c0f4b am 5c3b8fc0: am c13d8d6d: (-s ours) am 71e7e34c: am c64d28cf: Import translations. DO NOT MERGE
* commit '5c3b8fc009fc88b1895bbceb1fe766f7695bee11':
2012-02-10 10:20:17 -08:00
Eric Fischer
ff16cfb6cf am 35bdf805: am ac10c809: (-s ours) am a49dbe5e: (-s ours) am c64d28cf: Import translations. DO NOT MERGE
* commit '35bdf805bca7a1ded003a53775a5060816679081':
  Import translations. DO NOT MERGE
2012-02-10 10:20:16 -08:00
Eric Fischer
5c3b8fc009 am c13d8d6d: (-s ours) am 71e7e34c: am c64d28cf: Import translations. DO NOT MERGE
* commit 'c13d8d6d574fe5fd10b40714e97bc533d20d00cc':
2012-02-10 10:15:39 -08:00
Eric Fischer
35bdf805bc am ac10c809: (-s ours) am a49dbe5e: (-s ours) am c64d28cf: Import translations. DO NOT MERGE
* commit 'ac10c809516f6e320a9b179f1c4cccb64d6f6885':
  Import translations. DO NOT MERGE
2012-02-10 10:15:38 -08:00
Eric Fischer
c13d8d6d57 am 71e7e34c: am c64d28cf: Import translations. DO NOT MERGE
* commit '71e7e34c8f84d78e2d3d2e6ee06af931d20d6c9a':
2012-02-10 10:10:56 -08:00
Eric Fischer
ac10c80951 am a49dbe5e: (-s ours) am c64d28cf: Import translations. DO NOT MERGE
* commit 'a49dbe5eaef771f9985df5fdd347c13fcebe63e2':
  Import translations. DO NOT MERGE
2012-02-10 10:10:34 -08:00
Eric Fischer
71e7e34c8f am c64d28cf: Import translations. DO NOT MERGE
* commit 'c64d28cf91faa7c548b052dcfa8cfaa7c9d6e25a':
  Import translations. DO NOT MERGE
2012-02-10 10:08:05 -08:00
Eric Fischer
67cc33d31d am c64d28cf: Import translations. DO NOT MERGE
* commit 'c64d28cf91faa7c548b052dcfa8cfaa7c9d6e25a':
  Import translations. DO NOT MERGE
2012-02-10 10:07:16 -08:00
Eric Fischer
a49dbe5eae am c64d28cf: Import translations. DO NOT MERGE
* commit 'c64d28cf91faa7c548b052dcfa8cfaa7c9d6e25a':
  Import translations. DO NOT MERGE
2012-02-10 10:07:10 -08:00
Paul Westbrook
205282fc10 am 3a420bed: Use unique boot intent for Email2
* commit '3a420bed8354a0408885f5c1b3ce9bbfb3c953b6':
  Use unique boot intent for Email2
2012-02-09 15:00:24 -08:00
Paul Westbrook
3a420bed83 Use unique boot intent for Email2
Change-Id: Iffbedd93317676ddc1b25400c46fd016f26e0ba3
2012-02-09 14:55:11 -08:00
Paul Westbrook
48b55b24fc am 0e615fe3: Merge "First pass at a Email2 overlay of UnifiedEmail"
* commit '0e615fe3e313a4c8533db3870bd5b0f0b0715ec3':
  First pass at a Email2 overlay of UnifiedEmail
2012-02-09 14:45:55 -08:00
Paul Westbrook
0e615fe3e3 Merge "First pass at a Email2 overlay of UnifiedEmail" 2012-02-09 14:44:15 -08:00
Paul Westbrook
47cbfe7147 First pass at a Email2 overlay of UnifiedEmail
Change-Id: I41de9a5307d56f358bc523bb139cdf90a0786dae
2012-02-09 14:43:32 -08:00
Eric Fischer
16ad798b44 am 8368bb8b: Import translations. DO NOT MERGE
* commit '8368bb8ba1673d58bf3f8bf986b0223e134c60b2':
  Import translations. DO NOT MERGE
2012-02-09 10:15:03 -08:00
Eric Fischer
8368bb8ba1 Import translations. DO NOT MERGE
Change-Id: I360517bad7e868ee97739fbbec433db4d703f13c
2012-02-09 10:10:17 -08:00
Eric Fischer
c64d28cf91 Import translations. DO NOT MERGE
Change-Id: I81807b9a59c54fb2955248ac253adfcf87f7b19f
2012-02-08 18:19:59 -08:00
Marc Blank
d7e9ecad65 am 1e162747: Set the CAN_ACCEPT_MOVED_MESSAGES capability as appropriate
* commit '1e162747761e644cc2368c7c0f2108902bcb0f11':
  Set the CAN_ACCEPT_MOVED_MESSAGES capability as appropriate
2012-02-03 16:32:49 -08:00
Marc Blank
1e16274776 Set the CAN_ACCEPT_MOVED_MESSAGES capability as appropriate
Change-Id: Ifa6e098352afb5feaa277ed0614628eb1765992f
2012-02-03 16:28:18 -08:00
Marc Blank
87dd8e00a9 am 83dae570: Handle undo for "move to folder"
* commit '83dae570ed7decef4e0be46a0f88cfee142b993f':
  Handle undo for "move to folder"
2012-02-03 15:50:28 -08:00
Marc Blank
83dae570ed Handle undo for "move to folder"
Change-Id: Ie3847fe4919fc49411b8465e2600f85efb174d0a
2012-02-03 15:36:35 -08:00
Marc Blank
c9af7f0fe3 am e2488c3f: Handle move-to-folder from UI
* commit 'e2488c3f02b95c3b7857a9260b6a86911969fede':
  Handle move-to-folder from UI
2012-02-03 13:41:26 -08:00
Marc Blank
e2488c3f02 Handle move-to-folder from UI
Change-Id: I2165b9f83459c0b8f8817108dc294c7882730df8
2012-02-03 13:08:07 -08:00
Marc Blank
c1092fb9bc am 63d60d9e: Split EmailProvider into two classes (and about time)
* commit '63d60d9eb182d583d08e6d4b6dc11b392dede6f1':
  Split EmailProvider into two classes (and about time)
2012-02-03 12:53:19 -08:00
Marc Blank
63d60d9eb1 Split EmailProvider into two classes (and about time)
Change-Id: Ia72e8c83ea16718077ffe8b8d284d18b6f9f0786
2012-02-03 12:50:49 -08:00
Marc Blank
b6af8297fa am 87d7a604: Handle update of draft
* commit '87d7a604172d0e15454e8b615b163377e67050c1':
  Handle update of draft
2012-02-03 10:11:38 -08:00
Marc Blank
87d7a60417 Handle update of draft
Change-Id: I15c2b2b85afeff19e4ae7520c36a6119ab1e5cca
2012-02-03 09:51:07 -08:00
Marc Blank
a128cc6126 am 3a8291b3: Oops; generating bad URI for save message!
* commit '3a8291b3e02de754da4886ba40fdd0cd0fe54ad2':
  Oops; generating bad URI for save message!
2012-02-02 12:53:37 -08:00
Marc Blank
3a8291b3e0 Oops; generating bad URI for save message!
Change-Id: Iaf10108dee202c23abc6a18b9e5e8673c4813d0f
2012-02-02 12:38:25 -08:00
Marc Blank
502fdbfe7e am 12142f43: Support save/update draft and change of convo URI usage
* commit '12142f430ebbc81f29ac17da5944786c4c1eee4c':
  Support save/update draft and change of convo URI usage
2012-02-02 11:45:58 -08:00
Marc Blank
12142f430e Support save/update draft and change of convo URI usage
* For now, update not working (it's complicated)

Change-Id: I9df440338ac167f03ce4f2f4b36ad286adad318e
2012-02-02 11:43:05 -08:00
Marc Blank
0ab212f9ac am ff155a9a: Merge "Support undo for message deletes"
* commit 'ff155a9adb784a7042c5360d5492f4a32c61e046':
  Support undo for message deletes
2012-02-02 08:39:57 -08:00