Commit Graph

6667 Commits

Author SHA1 Message Date
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
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
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
3a420bed83 Use unique boot intent for Email2
Change-Id: Iffbedd93317676ddc1b25400c46fd016f26e0ba3
2012-02-09 14:55:11 -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
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
1e16274776 Set the CAN_ACCEPT_MOVED_MESSAGES capability as appropriate
Change-Id: Ifa6e098352afb5feaa277ed0614628eb1765992f
2012-02-03 16:28:18 -08:00
Marc Blank
83dae570ed Handle undo for "move to folder"
Change-Id: Ie3847fe4919fc49411b8465e2600f85efb174d0a
2012-02-03 15:36:35 -08:00
Marc Blank
e2488c3f02 Handle move-to-folder from UI
Change-Id: I2165b9f83459c0b8f8817108dc294c7882730df8
2012-02-03 13:08:07 -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
87d7a60417 Handle update of draft
Change-Id: I15c2b2b85afeff19e4ae7520c36a6119ab1e5cca
2012-02-03 09:51:07 -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
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
ff155a9adb Merge "Support undo for message deletes" 2012-02-02 08:38:06 -08:00
Marc Blank
5adc6c0be9 Support undo for message deletes
Change-Id: I55d8950ca782babc00b28ced7c4d23042882b05e
2012-02-02 08:27:19 -08:00
The Android Open Source Project
539e788a16 am ee0b5e95: am b42c1fd6: Reconcile with ics-mr1-release
* commit 'ee0b5e95ac465c4083976ce0242840080567b3b6':
2012-02-01 10:06:22 -08:00
The Android Open Source Project
ee0b5e95ac am b42c1fd6: Reconcile with ics-mr1-release
* commit 'b42c1fd67e3375326ba04383bd13414f03599d8f':
2012-02-01 10:01:27 -08:00
The Android Open Source Project
b42c1fd67e Reconcile with ics-mr1-release
Change-Id: I62f7aa19d71ace68216a5c595325c0b76b1f99ff
2012-02-01 08:50:33 -08:00
Eric Fischer
8b270b16e7 Import translations. DO NOT MERGE
Change-Id: I7846fc94a02995eb745a99ea2cf2eca6ffe6c3f4
2012-01-31 11:36:38 -08:00
Eric Fischer
f4470edba0 Import translations. DO NOT MERGE
Change-Id: Ia8a84e5f7491036049be69c8d7463538c5d8916a
2012-01-30 14:59:45 -08:00
The Android Open Source Project
1eb23148c3 am 98a030f7: Reconcile with ics-mr1-release
* commit '98a030f77ab4da59c49fe81d6fc7f70710774f85':
2012-01-30 13:38:54 -08:00
The Android Open Source Project
98a030f77a Reconcile with ics-mr1-release
Change-Id: I0c622eb972355e7078477024740d04b30fee1c88
2012-01-30 13:37:02 -08:00
Mindy Pereira
b057793bf2 Remove second copy of apache code. Depend on unified email for these classes.
Change-Id: Ibe3e18b8e38389bff7f0e3a3479b660b97f94c7e
2012-01-30 12:50:04 -08:00
The Android Automerger
8570b771c8 merge in ics-mr1-release history after reset to ics-mr1 2012-01-26 18:32:12 -08:00
Eric Fischer
5c9fc2f930 Merge "Import translations. DO NOT MERGE" 2012-01-26 13:57:10 -08:00
Eric Fischer
31cff20ea0 Import translations. DO NOT MERGE
Change-Id: Ibf2da5b4209fa38d30ee519e7b887263f50e0afd
2012-01-26 13:55:48 -08:00
Marc Blank
9c440c8b80 am 17c089fb: am ecaa9774: If we\'re stopped, make sure watchdog alarm is also stopped
* commit '17c089fb7b02bbe755a47f917f92394df6cbef03':
  If we're stopped, make sure watchdog alarm is also stopped
2012-01-26 11:49:55 -08:00
Marc Blank
17c089fb7b am ecaa9774: If we\'re stopped, make sure watchdog alarm is also stopped
* commit 'ecaa97741332e506afade647402896993ba64fba':
  If we're stopped, make sure watchdog alarm is also stopped
2012-01-26 11:47:18 -08:00
Marc Blank
ecaa977413 If we're stopped, make sure watchdog alarm is also stopped
Bug: 5647625
Change-Id: I33e94107f2d6e4a38a5a221df72ed83596ca7c54
2012-01-25 14:59:54 -08:00
Marc Blank
5520221f60 Handle insert instead of update for "send mail"
* Return proper Uri from insert

Change-Id: I5439fff9872a14c63504a17a2bfef34ff19f99c6
2012-01-24 14:49:08 -08:00
Marc Blank
7f667159c9 Merge "Handle convo read/starred/deleted" 2012-01-24 10:27:27 -08:00
Marc Blank
5e392205dc Handle convo read/starred/deleted
* Send UIProvider notification when changes are made by sync engine

Change-Id: I3076c739b13b40e931277f1b5ac08447c814ff6f
2012-01-23 14:17:09 -08:00
Andy McFadden
d16fa893d1 Use Map.Entry, not HashMap.Entry
Map.Entry is the defined return value from entrySet().  HashMap.Entry
shouldn't be used directly.

Change-Id: I855f7a4e855776deb83754ca89c2a4128e9e04a2
2012-01-20 14:39:48 -08:00
Marc Blank
c8afa2f5cb Send attachments w/ UnifiedEmail outgoing mail
Change-Id: I471816dcaac1ab53aea1465dd69ae4453a1a0268
2012-01-17 15:38:24 -08:00
Marc Blank
1d3f98c522 Merge "Store UI-friendly addresses in EmailProvider database" 2012-01-17 13:22:16 -08:00
Marc Blank
36ed276f7a Store UI-friendly addresses in EmailProvider database
* Currently, we store a generally incompatible packed string format
  for to, from, bcc, cc, and reply-to columns
* Change this to UI-compatible, comma-separated RFC822 strings
* Upgrade database to use new format

Change-Id: I42c01d72b49531c4324d3956edf5ff362d5c9120
2012-01-17 13:11:45 -08:00
Mindy Pereira
ce1791abf3 Update to new message column names.
Change-Id: Ie24fc8e0529ff363dc8bf7a5f6522b601560b91a
2012-01-17 08:22:39 -08:00
Marc Blank
6605115ec4 Set notify uri for queries; trigger notify on message inserts
Change-Id: I9fdf2f83670ec72937deebe352e962632f37b519
2012-01-13 15:02:45 -08:00
Marc Blank
788d52d831 Send new columns for message header; real data for msg counts
Change-Id: I88f560beafdf8cf9194664a63cf74436be281056
2012-01-13 13:00:07 -08:00
Marc Blank
bb760d73f0 Sort message (conversation) list properly
Change-Id: Id208890abf4c646fe8eba01bbfe22de35c610e3c
2012-01-13 12:35:43 -08:00
Marc Blank
bdf32afa64 Hook up primitive email sending to UIProvider
Change-Id: I5fe949c3cdf3d04514976d029d966caa912ec5be
2012-01-13 11:35:46 -08:00
Andy Huang
96d0323cfa remove CLIENT_CREATED usage
Change-Id: Icb102ef554e9e945bdf4866d0038892556fcf739
2012-01-12 15:10:28 -08:00
Marc Blank
ca6f713e71 Oops; fix order of TABLE_NAMES
Change-Id: I994b31c05c640f61444ae3d66c5b94e1d147e698
2012-01-12 14:39:57 -08:00
Mindy Pereira
e9e865345e Set c to the result of the query.
Change-Id: I5b8c935aedcdd86d756ee7de70088f2c8db179d5
2012-01-12 14:25:49 -08:00
Marc Blank
0c550c343f Return "0" for unknown columns in UIProvider queries
* For now, let's avoid exceptions

Change-Id: I5758f3aefb458c00fd3fc1865e63df92e9ba1650
2012-01-12 13:36:50 -08:00
Marc Blank
3594ac8146 Implement initial UIProvider operations (UnifiedEmail)
* Add support for folder list, conversation list, and message view
  queries
* Open up EmailProvider (temporarily) to allow access from
  UnifiedEmail (signatures don't currently match)
* Modify make file so that we can reference definitions in
  UIProvider

Change-Id: If73c59aa9edfdac5619ff2c6b9cedfdfe4e93d6f
2012-01-12 11:18:01 -08:00
The Android Open Source Project
23dd801d5d am 861de21e: Reconcile with ics-mr1-release
* commit '861de21e614df941810bb1e233e2ddc420884df3':
2012-01-12 09:00:23 -08:00
The Android Open Source Project
861de21e61 Reconcile with ics-mr1-release
Change-Id: I75b1ffd0c42f969b04bbef1afe6cfdfcaf49ffb9
2012-01-12 08:56:50 -08:00