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
60ade1419c
am 9c440c8b
: am 17c089fb
: am ecaa9774
: If we\'re stopped, make sure watchdog alarm is also stopped
...
* commit '9c440c8b8078a47d340647ea86062c1446ffb579':
If we're stopped, make sure watchdog alarm is also stopped
2012-01-26 11:52:29 -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
b8dc3a1d9e
am 5520221f
: Handle insert instead of update for "send mail"
...
* commit '5520221f60e6ef2739a1898e24e0ef9d26a2c94f':
Handle insert instead of update for "send mail"
2012-01-24 14:53:50 -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
f378cc6fee
am 7f667159
: Merge "Handle convo read/starred/deleted"
...
* commit '7f667159c9ecf44fe7f3da8741e537a6d20f5c60':
Handle convo read/starred/deleted
2012-01-24 10:29:58 -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
13646739db
am d16fa893
: Use Map.Entry, not HashMap.Entry
...
* commit 'd16fa893d1a24497147fd91b32698ff7bf695600':
Use Map.Entry, not HashMap.Entry
2012-01-23 09:36:03 -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
82d0f17b4a
am c8afa2f5
: Send attachments w/ UnifiedEmail outgoing mail
...
* commit 'c8afa2f5cbdcc9b3c59d93e9a8ab1bc1e75dd91f':
Send attachments w/ UnifiedEmail outgoing mail
2012-01-17 15:40:46 -08:00
Marc Blank
c8afa2f5cb
Send attachments w/ UnifiedEmail outgoing mail
...
Change-Id: I471816dcaac1ab53aea1465dd69ae4453a1a0268
2012-01-17 15:38:24 -08:00
Marc Blank
03542599ea
am 1d3f98c5
: Merge "Store UI-friendly addresses in EmailProvider database"
...
* commit '1d3f98c5229d0cb9f270a1601b71b8d887cf5416':
Store UI-friendly addresses in EmailProvider database
2012-01-17 13:25:13 -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
2fb749f062
am ce1791ab
: Update to new message column names.
...
* commit 'ce1791abf3326c50da41ab3631738ff28e9a1a54':
Update to new message column names.
2012-01-17 09:22:58 -08:00
Mindy Pereira
ce1791abf3
Update to new message column names.
...
Change-Id: Ie24fc8e0529ff363dc8bf7a5f6522b601560b91a
2012-01-17 08:22:39 -08:00
Marc Blank
519b34ac53
am 6605115e
: Set notify uri for queries; trigger notify on message inserts
...
* commit '6605115ec4bd02f9adf190e0b390ceed783bde5b':
Set notify uri for queries; trigger notify on message inserts
2012-01-13 15:09:17 -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
a074ffb102
am 788d52d8
: Send new columns for message header; real data for msg counts
...
* commit '788d52d831cbc5ec0288655bee2cfe2d0616a1b1':
Send new columns for message header; real data for msg counts
2012-01-13 14:16:16 -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
a1642b39e6
am bb760d73
: Sort message (conversation) list properly
...
* commit 'bb760d73f08041f2f2e813054a02698b3ea17960':
Sort message (conversation) list properly
2012-01-13 12:43:34 -08:00
Marc Blank
bb760d73f0
Sort message (conversation) list properly
...
Change-Id: Id208890abf4c646fe8eba01bbfe22de35c610e3c
2012-01-13 12:35:43 -08:00
Marc Blank
7ebf6684b0
am bdf32afa
: Hook up primitive email sending to UIProvider
...
* commit 'bdf32afa644f566e8be90048ed631e0e70332ac5':
Hook up primitive email sending to UIProvider
2012-01-13 11:50:51 -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
054d03fffc
am 96d0323c
: remove CLIENT_CREATED usage
...
* commit '96d0323cfa841361f5a53ef96a66fad9155a5c8b':
remove CLIENT_CREATED usage
2012-01-12 15:16:37 -08:00
Andy Huang
96d0323cfa
remove CLIENT_CREATED usage
...
Change-Id: Icb102ef554e9e945bdf4866d0038892556fcf739
2012-01-12 15:10:28 -08:00
Marc Blank
be301075ab
am ca6f713e
: Oops; fix order of TABLE_NAMES
...
* commit 'ca6f713e71ce3734bc688b9821fc6838b5d70de1':
Oops; fix order of TABLE_NAMES
2012-01-12 14:42:39 -08:00
Marc Blank
ca6f713e71
Oops; fix order of TABLE_NAMES
...
Change-Id: I994b31c05c640f61444ae3d66c5b94e1d147e698
2012-01-12 14:39:57 -08:00
Mindy Pereira
7b19e26796
am e9e86534
: Set c to the result of the query.
...
* commit 'e9e865345eb5f586e3f972db8c3c714fb6bb5aad':
Set c to the result of the query.
2012-01-12 14:30:52 -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
d81279f2f4
am 0c550c34
: Return "0" for unknown columns in UIProvider queries
...
* commit '0c550c343fecaec3e04fba274d1ac08bd722d311':
Return "0" for unknown columns in UIProvider queries
2012-01-12 13:51:51 -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
3a52d58eec
am 3594ac81
: Implement initial UIProvider operations (UnifiedEmail)
...
* commit '3594ac81469c55c1ee6ee4594c2ca52942a7c354':
Implement initial UIProvider operations (UnifiedEmail)
2012-01-12 11:44:25 -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
733f219dc3
am 23dd801d
: am 861de21e
: Reconcile with ics-mr1-release
...
* commit '23dd801d5db0d8a5e5e5dd3266708e6167195c9f':
2012-01-12 09:04:02 -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
The Android Automerger
0cab48f73b
merge in ics-mr1-release history after reset to ics-mr1
2012-01-11 16:29:28 -08:00
Paul Westbrook
3de498df16
am 75987dbe
: am 17d522b5
: am 07676012
: Fix widget updates
...
* commit '75987dbe0ca7609bf4f11f2d7edfe4bcd70a4fe5':
Fix widget updates
2012-01-10 09:03:04 -08:00
Paul Westbrook
75987dbe0c
am 17d522b5
: am 07676012
: Fix widget updates
...
* commit '17d522b51c9aa564e1989095e0264264642c2432':
Fix widget updates
2012-01-09 16:37:39 -08:00
Paul Westbrook
17d522b51c
am 07676012
: Fix widget updates
...
* commit '07676012f7e4060faa0d23dc6068e9dcdd4a4106':
Fix widget updates
2012-01-09 16:12:33 -08:00
Paul Westbrook
07676012f7
Fix widget updates
...
Fix widgets that stop updating. If the Launcher got killed, the Email
widget service gets unbound. When this happens the cursor loader for the
widget is stopped. Since widget is relying on the loader to update the data,
when the loader is stopped, the widget would never update.
Now when email recognizes a change, it will send a broadcast intent, which
will cause the widget service to be started, if it isn't.
Bug: 5811810
Change-Id: Ia840e58f10e780b94440119662c2e48e7785c507
2012-01-09 13:14:47 -08:00
The Android Open Source Project
3ce35c4ea5
am faefb0e8
: am b71766ef
: Reconcile with ics-mr1-release
...
* commit 'faefb0e8b5f294e5e2179d31932ef7e5652865ee':
2012-01-05 12:13:26 -08:00
The Android Open Source Project
faefb0e8b5
am b71766ef
: Reconcile with ics-mr1-release
...
* commit 'b71766efa0764380f1d2537c742395ec0cc9ac75':
2012-01-05 12:08:49 -08:00
The Android Open Source Project
b71766efa0
Reconcile with ics-mr1-release
...
Change-Id: I05adbf7bf61a379abb5abab721e55f73b35f0185
2012-01-05 07:45:55 -08:00
Marc Blank
203449721b
am df9f6f60
: am 93bc609c
: (-s ours) am 9b4240f7
: DO NOT MERGE: Handle UI part of email lookback limit
...
* commit 'df9f6f60f4d3c32efd3e7e9e295a74880ea37e93':
DO NOT MERGE: Handle UI part of email lookback limit
2012-01-04 20:10:40 -08:00