Brian Muramatsu
d163332bc5
am d5fdf404
: Merge "Fix STARTTLS handshake error in Email\'s SmtpSender class"
...
* commit 'd5fdf40490033bbafbd946e92094b18e931c1a76':
Fix STARTTLS handshake error in Email's SmtpSender class
2012-03-07 02:09:18 -08:00
Brian Muramatsu
d5fdf40490
Merge "Fix STARTTLS handshake error in Email's SmtpSender class"
2012-03-06 17:26:04 -08:00
Misha Nasledov
c31e2555bf
Fix STARTTLS handshake error in Email's SmtpSender class
...
The Email.apk checks for "-STARTTLS" in the SMTP server's EHLO response
but SMTP servers may respond with STARTTLS on the last line as such:
250 STARTTLS
Or even as part of a line as such:
250-XSECURITY=NONE,STARTTLS
Checking for "-STARTTLS" in this case will break. The fix is to simply check
for "STARTTLS" instead.
See http://code.google.com/p/android/issues/detail?id=19109
And http://code.google.com/p/android/issues/detail?id=2309
Change-Id: I3a590a4398cb664f46875650550986a67f320f76
2012-02-29 03:15:10 -08:00
The Android Open Source Project
9a1ffd65d4
Reconcile with ics-mr1-release
...
Change-Id: Ia892bd8ec2198a37c8cfd79daafd8873a365c0af
2012-02-16 10:02:57 -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
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
Eric Fischer
c64d28cf91
Import translations. DO NOT MERGE
...
Change-Id: I81807b9a59c54fb2955248ac253adfcf87f7b19f
2012-02-08 18:19:59 -08:00
The Android Open Source Project
98a030f77a
Reconcile with ics-mr1-release
...
Change-Id: I0c622eb972355e7078477024740d04b30fee1c88
2012-01-30 13:37:02 -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
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
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
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
b71766efa0
Reconcile with ics-mr1-release
...
Change-Id: I05adbf7bf61a379abb5abab721e55f73b35f0185
2012-01-05 07:45:55 -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
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
The Android Open Source Project
163d3521fb
Reconcile with ics-mr1-release
...
Change-Id: I81d29eeea3d099d15968955ccadd8a330c6fbae6
2011-12-09 07:11:37 -08:00
The Android Automerger
e8949d30bc
merge in ics-mr1-release history after reset to ics-mr1
2011-12-08 17:35:48 -08:00
Mindy Pereira
82e050dbbb
am 6d7eef22
: DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
...
* commit '6d7eef22cd2634bd0da8de8e38635dd92b3e5a48':
DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
2011-12-08 15:33:32 -08:00
Mindy Pereira
6d7eef22cd
DO NOT MERGE. Fix issue where back stack is not cleared when opening email from a notification.
...
Fixes b/5716835 back stack in email gets messed up in certain circumstances
Change-Id: I499a1c19f1ebbb7e4debde690cacf17f9f6c3454
2011-12-08 13:47:02 -08:00
Eric Fischer
c34330bb45
am 0130c5a0
: Import revised translations. DO NOT MERGE
...
* commit '0130c5a03756b01ec4a39422ab08474625153a81':
Import revised translations. DO NOT MERGE
2011-12-08 11:13:16 -08:00
Eric Fischer
0130c5a037
Import revised translations. DO NOT MERGE
...
Change-Id: I0b065eb88500457583eedf899db1c76ef939dbab
2011-12-08 10:34:54 -08:00
The Android Open Source Project
35353d2598
Reconcile with ics-mr1-release
...
Change-Id: I7fa1d584dcfecb90d259d70546b269118533f00c
2011-12-08 10:22:14 -08:00
The Android Automerger
0fe9c4a616
merge in ics-mr1-release history after reset to ics-mr1
2011-12-06 16:54:41 -08:00
Eric Fischer
844b1556b1
Import revised translations. DO NOT MERGE
...
Change-Id: I1a328a978d6968242ed48871c636a8000fb7ffb9
2011-12-06 10:28:50 -08:00
The Android Automerger
57b399860d
merge in ics-mr1-release history after reset to ics-mr1
2011-12-01 06:46:38 -08:00
Mindy Pereira
58253012a0
DO NOT MERGE Fix message list width and margins
...
Fixes b/5691557 Email tablet split view convo list text alignment has regressed
Change-Id: I031b35580c8715768719e7ea8a2685eb6aed3d31
2011-11-30 16:57:01 -08:00
The Android Automerger
43a086d857
merge in ics-mr1-release history after reset to ics-mr1
2011-11-30 06:46:40 -08:00
Minh Pham
16439d5e23
Fix date margin
...
- Use a specific margin for date in normal mode.
Bug: 5685616
Change-Id: I38843b66e8e2cbc077f2d7421a4e1cb86b274dc5
2011-11-29 17:40:12 -08:00
Eric Fischer
702d2e2bfd
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-29 13:26:50 -08:00
Eric Fischer
cbf700f85b
Import revised translations. DO NOT MERGE
...
Change-Id: I238d3246e725ddfa38c2b53d842c7e97c2d00bf8
2011-11-29 13:15:11 -08:00
Jeff Brown
d462ae95e4
Add application launch category.
...
Bug: 5674723
Change-Id: I8eb030c9bdc29769b7a3c7e3ca383d29c0a0ebdb
2011-11-28 20:11:53 -08:00
The Android Automerger
572166ddf0
merge in ics-mr1-release history after reset to ics-mr1
2011-11-28 12:22:53 -08:00
The Android Automerger
7d5655758e
merge in ics-mr1-release history after reset to ics-mr1
2011-11-22 11:56:41 -08:00
Eric Fischer
fb67595257
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-11-21 15:26:35 -08:00
Eric Fischer
208346aaf5
Import revised translations. DO NOT MERGE
...
Change-Id: I2b7089ceb301e014b44a702a20fb2ccf0fd31574
2011-11-21 14:58:32 -08:00
Vikram Aggarwal
dd4f501b44
Merge "Accurately update the preference summary string when changing the vibrate setting." into ics-mr1
2011-11-18 12:52:18 -08:00
Mindy Pereira
d22cf7bda7
Merge "DO NOT MERGE ListView eill always show dividers below items if all items in the adapter are enabled." into ics-mr1
2011-11-18 12:13:16 -08:00
Mindy Pereira
9eeb535f6f
Merge "Make message items aware of the various modes." into ics-mr1
2011-11-18 12:05:39 -08:00
Vikram Aggarwal
7d28a1c279
Accurately update the preference summary string when changing the
...
vibrate setting.
Fix b/5639748
Change-Id: Ice6d4770c156104495d476826a636487f4df5f1b
2011-11-18 11:14:11 -08:00
Mindy Pereira
e4202e782c
Make message items aware of the various modes.
...
On two pane tablet in portrait mode, the message list items may not
be wide enough to be considered "WIDE_MODE", however, when they are shown
in the message list mode, they should ALWAYS use message list mode backgrounds.
Fixes b/5641014 email portrait: missing the vertical divider between folders and messages
Change-Id: Ied05386f1ab62c48b1824647c95a6f72baabc859
2011-11-18 09:26:49 -08:00
Mindy Pereira
8579139473
DO NOT MERGE ListView eill always show dividers below items if all items in the adapter are enabled.
...
It seems like it should not show a divider on the last item when there are headers
OR infer not all items enabled when there are headers, but it doesn't.
Fixes b/5517092 extra divider line between last label and next header in label list
Change-Id: I3f70bbf0d33883df4c60596411481504f627f350
2011-11-17 16:57:59 -08:00
The Android Automerger
b665908396
merge in ics-mr1-release history after reset to ics-mr1
2011-11-17 06:47:01 -08:00
Eric Fischer
4802688b03
Import revised translations. DO NOT MERGE
...
Change-Id: I16cfe6de6623792dacba1797e50a08ee1dd07702
2011-11-16 10:14:35 -08:00
The Android Automerger
744214b812
merge in ics-mr1-release history after reset to ics-mr1
2011-11-16 06:46:45 -08:00
Marc Blank
bcadbc5fce
Merge "Fix ICS setup regression" into ics-mr1
2011-11-15 16:12:02 -08:00