Commit Graph

6646 Commits

Author SHA1 Message Date
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
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
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
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
df9f6f60f4 am 93bc609c: (-s ours) am 9b4240f7: DO NOT MERGE: Handle UI part of email lookback limit
* commit '93bc609c9e2d02b6a0ae8a6f6cf8489336aeb135':
  DO NOT MERGE: Handle UI part of email lookback limit
2012-01-04 20:08:25 -08:00
The Android Automerger
68e2e770f4 merge in ics-mr1-release history after reset to ics-mr1 2012-01-04 16:42:42 -08:00
Marc Blank
93bc609c9e am 9b4240f7: DO NOT MERGE: Handle UI part of email lookback limit
* commit '9b4240f7c5647c2952b050bb74f18eba274f51f8':
  DO NOT MERGE: Handle UI part of email lookback limit
2012-01-04 13:08:01 -08:00
Marc Blank
9b4240f7c5 DO NOT MERGE: Handle UI part of email lookback limit
Bug: 5792217
Change-Id: Iccd6b1db30e8fb1fbdb514ed2de6d1e789a6280a
2012-01-04 11:51:08 -08:00
Eric Fischer
6dd5834458 Import revised translations.
Change-Id: Ia7c67cf329c73f2f472f6b3cd5677b4ae0ead4c0
2011-12-29 12:10:49 -08:00
Marc Blank
d85413e946 Merge "Handle UI part of enforcing email lookback limit" 2011-12-22 13:22:50 -08:00
Marc Blank
919e59044b Handle UI part of enforcing email lookback limit
Bug: 5792217
Change-Id: I4351ae4d8505965a32690ecb5e6338765fb3770f
2011-12-21 17:44:59 -08:00
Conley Owens
037904adb4 am e3def6c9: Make TAG field package-private in several classes
* commit 'e3def6c9c4294e9f537d499911b792c89bec2b3c':
  Make TAG field package-private in several classes
2011-12-21 16:54:17 -08:00
Conley Owens
e3def6c9c4 Make TAG field package-private in several classes
Specifically, several internal classes.

This makes a little more sense since they are accessed outside of the
class that they are defined in.

In addition, this fixes errors created by proguard when building with
OpenJDK.

Change-Id: If2e2f90558e04e777a0c4dbc2ccd1f6c46dd8228
2011-12-21 12:45:19 -08:00
Conley Owens
58ce2d0c3a Make TAG field package-private in several classes
Specifically, several internal classes.

This makes a little more sense since they are accessed outside of the
class that they are defined in.

In addition, this fixes errors created by proguard when building with
OpenJDK.

Change-Id: If2e2f90558e04e777a0c4dbc2ccd1f6c46dd8228
2011-12-20 11:58:29 -08:00
Mindy Pereira
d5109cf7f0 Use static library resources from chips.
Change-Id: I4261004dda1bd106d0c0ad0aec8348920ffd8c7e
2011-12-15 14:01:22 -08:00
Mindy Pereira
68c38d119f Increase allowed chars for sync calendar string.
Fixes b/5748113 tk_source_broad_ Android_GoogleJob [190999/ - ]-GTT_request character extension

Change-Id: I29ec26a9d2278a0c02f4cc055d8ae55460a8bf22
2011-12-13 09:34:33 -08:00
The Android Open Source Project
76df3996ee am 163d3521: Reconcile with ics-mr1-release
* commit '163d3521fb8d30c88e682f48bf9f055adeb566cd':
2011-12-12 15:30:01 -08:00
Mindy Pereira
b64944e9d1 am 82e050db: (-s ours) am 6d7eef22: DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
* commit '82e050dbbb0db1fbc02f7abacb9c1e7b7cb03180':
  DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
2011-12-12 12:35:00 -08:00
Eric Fischer
3adec178ad am c34330bb: (-s ours) am 0130c5a0: Import revised translations. DO NOT MERGE
* commit 'c34330bb45887b5057145d1c91563fdf89be0fe6':
  Import revised translations. DO NOT MERGE
2011-12-09 14:58:14 -08:00