Commit Graph

6894 Commits

Author SHA1 Message Date
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
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
8df1803726 am 539e788a: am ee0b5e95: am b42c1fd6: Reconcile with ics-mr1-release
* commit '539e788a1606d64da4fac517ca10cdcbd393fa41':
2012-02-01 10:10:16 -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
6873c8f27f am 8b270b16: Import translations. DO NOT MERGE
* commit '8b270b16e74b3f63fc6568484f047967f9f111eb':
  Import translations. DO NOT MERGE
2012-01-31 12:59:34 -08:00
Eric Fischer
8b270b16e7 Import translations. DO NOT MERGE
Change-Id: I7846fc94a02995eb745a99ea2cf2eca6ffe6c3f4
2012-01-31 11:36:38 -08:00
Eric Fischer
bc91431c64 am f4470edb: Import translations. DO NOT MERGE
* commit 'f4470edba0c049f445821e723a922b3811977564':
  Import translations. DO NOT MERGE
2012-01-30 15:03:24 -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
bbfbde84be am 1eb23148: am 98a030f7: Reconcile with ics-mr1-release
* commit '1eb23148c33418893754d3afb09f038f1b1cafc0':
2012-01-30 13:43:01 -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
603e684c3f am b057793b: Remove second copy of apache code. Depend on unified email for these classes.
* commit 'b057793bf2a9d46a2dcf1b870f3d19aef7cac2e8':
  Remove second copy of apache code. Depend on unified email for these classes.
2012-01-30 12:58:57 -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
8f7d0cd21f am 5c9fc2f9: Merge "Import translations. DO NOT MERGE"
* commit '5c9fc2f930a68c1888fa557891bdc2522c0c5acb':
  Import translations. DO NOT MERGE
2012-01-26 14:00:49 -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
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