Commit Graph

5858 Commits

Author SHA1 Message Date
The Android Automerger
9c8703fd46 merge in ics-release history after reset to master 2011-07-15 06:45:19 -07:00
Ben Komalo
5e52339306 Merge "Update message header actions for phones." 2011-07-14 17:51:00 -07:00
Ben Komalo
91f1d451a6 Merge "Put "show all folders" in action bar" 2011-07-14 17:49:46 -07:00
Ben Komalo
1917bcbc17 Put "show all folders" in action bar
Change-Id: I4af74342b3b1eae3a94ebf6616280ebf47d14e5f
2011-07-14 17:44:00 -07:00
Ben Komalo
08f068c9ce Update message header actions for phones.
- This creates a "more" icon in portrait and shows all three actions
(reply/replyall/forward) in landscape.
- also makes the star visible by default (hiding it in EML view)

Change-Id: Iefff7c0717cfda4dc91218b0d490775294c96103
2011-07-14 17:23:21 -07:00
Marc Blank
68ce7f3d60 Merge "Send proper parameter to startSync (via EmailService)" 2011-07-14 16:14:19 -07:00
Ben Komalo
b507ece493 Remove stale STOPSHIPs
Change-Id: I2364e1dbf25b9df20ef9fa9014e19cbbab278a3b
2011-07-14 14:45:36 -07:00
Ben Komalo
83b0f4434c Merge "Fixup recent mailboxes." 2011-07-14 12:41:15 -07:00
Ben Komalo
d6ad9b8c03 Fixup recent mailboxes.
The default recent list should be pre-populated and fall off the list as
normal. The previous implementation showed a default list if there were
no touched mailboxes, but then the default list disappeared as soon as
there was one touched.

Bug: 5020673
Change-Id: Ifad607a9d36feff837ab42d039ce9209f223f345
2011-07-14 12:03:16 -07:00
Marc Blank
21913ced32 Send proper parameter to startSync (via EmailService)
Bug: 5014063
Change-Id: If236a02e92adef06f2a9ca3779d08778915ed6e9
2011-07-14 11:59:22 -07:00
Jorge Lugo
b9d835a2bb Merge "Don't display warning message on edit incoming settings" 2011-07-14 11:44:50 -07:00
Jorge Lugo
cf194df05c Don't display warning message on edit incoming settings
On phones, opening "incoming settings" no longer immediately displays
the warning message associated with editing the username field. It now
only displays when the username is focused by the user.

Bug: 4282856
Change-Id: Ic0a74fa91a0f9cff66565372872e182a0eaec779
2011-07-14 11:38:30 -07:00
Marc Blank
53dddf3c55 Fix loss of client updates in IMAP when no connectivity
Bug: 5014965
Change-Id: Id5c6696ea1add598f180e739398ab14f60e382a3
2011-07-14 11:04:05 -07:00
The Android Automerger
6feeabae11 merge in ics-release history after reset to master 2011-07-14 07:07:47 -07:00
Jorge Lugo
89010fe39f Merge "Don't show To/Cc/Bcc hint text on tablet" 2011-07-13 19:52:38 -07:00
Jorge Lugo
f8dbd95695 Don't show To/Cc/Bcc hint text on tablet
Since tablet already has to/cc/bcc labels, don't show the hint
text -- only do so when labels don't exist.

Bug: 5019806
Change-Id: I039de06e2576688e654fb0504a027cd9b9b67def
2011-07-13 18:54:51 -07:00
Ben Komalo
acd985efb4 update one more test for default account changes
Change-Id: I36344a9c0a29d718ec9dd3d51d9abfbc435252f0
2011-07-13 17:10:16 -07:00
Ben Komalo
04bd9aa8b3 Merge "Unit test updates for default account changes" 2011-07-13 16:47:27 -07:00
Jorge Lugo
abec4e631c Merge "Prevent account flip flopping from compose" 2011-07-13 16:35:50 -07:00
Ben Komalo
52e66110d8 Unit test updates for default account changes
Change-Id: Id619de198a84d1da43068a90474ed76ece9a30b5
2011-07-13 15:16:55 -07:00
Ben Komalo
47e8548682 Merge "Remove dead code" 2011-07-13 15:09:31 -07:00
Ben Komalo
4de538be2d Prevent account flip flopping from compose
There were two issues:
- the default account ID from the provider wasn't consistent: it was
using a snapshot from the cached data but that simply returns a Map, and
the values aren't guaranteed to be sorted (and indeed I saw that the
order was different on consecutive calls!)
- hitting app up from Compose always just kicked you out to the inbox
for the default account, but it probably should have used the account of
the compose screen, since it can be specified in the Intent

Bug: 5012008
Change-Id: Ic9a753b261e047790453bc1a9417bc0c6d2f87f9
2011-07-13 14:46:50 -07:00
Marc Blank
2a33dde4d1 Delete PIM data, etc. on device admin disable
* We were deleting secured accounts when device admin is disabled,
  but we were not deleting associated data, which means that
  contacts, calendar, and attachment data were left on device

Bug: 5021062
Change-Id: Iabeec2dcd6ef4f52dc52e43d62803e61f7881c0d
2011-07-13 09:17:23 -07:00
The Android Automerger
864c666f8c merge in ics-release history after reset to master 2011-07-13 07:46:54 -07:00
Ben Komalo
3cfb3d5077 Remove dead code
Change-Id: I66bec3975b3f028081071b9bbd26206ec369da26
2011-07-12 20:42:16 -07:00
Marc Blank
4c0e5c0d0a Remove unneeded (and harmful) test in MessagesAdapter
* This fixes the case in which messages are being loaded upon
  initial sync, but do NOT appear in the message list (at least
  until leaving and re-entering the app/mailbox)
* The problem was that MessagesAdapter was checking the state
  of the HOLDS_MAIL flag, which might not have been set at the
  time the Inbox was created; it turns out that the check is
  not necessary, so we remove it here

Bug: 5008696
Change-Id: I009ddf7d82d938758b99c855dfd0271596c5248a
2011-07-12 16:49:48 -07:00
Marc Blank
6fc054daa6 Merge "Add support for TrafficStats; use with IMAP/POP3" 2011-07-12 11:42:01 -07:00
Mindy Pereira
5b291fe086 Merge "Fix padding for recipient edit text fields." 2011-07-12 11:39:04 -07:00
Mindy Pereira
c39b639fc8 Fix padding for recipient edit text fields.
Change-Id: I08b84173d91ae43187489c6a6f455eb44499463f
2011-07-12 11:33:27 -07:00
Ben Komalo
4e32489c55 Merge "Support SMTP servers not requiring auth" 2011-07-12 11:30:35 -07:00
Marc Blank
190b2fb8a1 Add support for TrafficStats; use with IMAP/POP3
* All IMAP/POP3 functionality uses TrafficStats except for
  attachment loading (subsequenc CL)

Bug: 4988322

Change-Id: I91d826e0f7151a2101b642c868ab8c37e9660332
2011-07-12 11:28:58 -07:00
Ben Komalo
294bea6e93 Merge "Fix action bar text styles." 2011-07-12 10:00:19 -07:00
The Android Automerger
20ce513d90 merge in ics-release history after reset to master 2011-07-12 06:41:06 -07:00
Ben Komalo
9e8da783a8 Fix action bar text styles.
This makes custom styles in landscape,portrait, and tablet mode since
the action bar real estate differs in those modes.

Bug: 5010826
Change-Id: I2bd6bdcf9adc44a4d0084d4b2bfbffb472f03643
2011-07-11 18:29:18 -07:00
Daisuke Miyakawa
b4983afcec Merge "Reflect changes in chips library" 2011-07-11 16:53:29 -07:00
Ben Komalo
c456c257aa Fix missing imports from bad eclipse settings
Change-Id: Iebc2faa4cb8b125a5ee8071119daa771c66b54b2
2011-07-11 14:16:13 -07:00
Daisuke Miyakawa
9753d2fde1 Reflect changes in chips library
Must be with Iad5b8444f4b1949666d93ad43a34de057aba560e

Bug: 4996797
Change-Id: I5f83103628c14dd5079515c46c42a6f43d4f194c
2011-07-11 14:14:18 -07:00
Ben Komalo
7a29fb97b1 Misc compose bug fixes.
- empty subjects should still be prepended with "Re:" and "Fwd:" when
replied/forwarded
- the compose body was being vertically centered

Bug: 5008785
Change-Id: I28e4fac8457c4fd18c764daa35d9deea1646474b
2011-07-11 14:07:12 -07:00
Ben Komalo
b03d8088f6 Merge "Filter out Search mailbox from recents." 2011-07-11 13:52:12 -07:00
Ben Komalo
cf7cd933db Filter out Search mailbox from recents.
Bug: 5015109
Change-Id: I4e4982bbedc388529eb2f3a9c06ecac47a0a85f0
2011-07-11 13:07:22 -07:00
Ben Komalo
e05f511a4e Add entry in settings to clear trusted senders
Bug: 5011682
Change-Id: I09a557e4bb0ce3e17f796bcc5693e405f23e8c7e
2011-07-11 12:14:26 -07:00
Ben Komalo
1100ee5722 Merge "Update compose view action icons" 2011-07-11 12:11:23 -07:00
Ben Komalo
faff1fab83 Merge "Fix actionbar text alignment" 2011-07-11 10:47:37 -07:00
Ben Komalo
36aeaa6f7e Merge "Fix compose body alignment." 2011-07-11 10:47:16 -07:00
Ben Komalo
1aa5e18902 Update compose view action icons
Don't use split action bar in phone compose view (we lose too much
vertical real estate) and just tuck a lot of the menus under the menu
item.

Bug: 5011815
Change-Id: I04b009556a5984fa4b60f54f2d094c3b7c8a5c78
2011-07-11 10:23:22 -07:00
Ben Komalo
396a425d79 Make search icon appear again.
The CL I just checked in to reduce the invalidateOptionsMenu calls
removes the search icon because it expects the message list to be ready.
Instead of just invalidating the menu a bunch more, just make it so that
the icon is always shown, but we can't actually search if the message
list isn't ready. The time between the icon being shown and the list
being ready should be miniscule.

Change-Id: I5dfe9363cc904833253cf1fceeeb2af2ec389217
2011-07-11 09:44:33 -07:00
Ben Komalo
f4f10a3fdf Make client certificate requests optional.
This prevents things from always failing if the server requires a client
SSL certificate.

Note that the solution used to determine if a certificate request was
made for a given request is approximate; it is timestamp based and can
theoretically give a false positive. In practice, this is very unlikely,
since another cert request had to have happened around the same time,
AND the response must be a 401/403.

Change-Id: Ieb77cf91db3bd52ba4adf1fb07357fef7e204ba5
2011-07-11 09:28:33 -07:00
Ben Komalo
490708b079 Merge "Prevent wasteful calls to invalidateOptionsMenu" 2011-07-11 09:02:32 -07:00
Ben Komalo
b0a14e4f1a Merge "SmtpSender: Send EHLO that adheres to RFC2821" 2011-07-11 09:01:53 -07:00
The Android Automerger
d6a26da9d1 merge in ics-release history after reset to master 2011-07-11 06:45:00 -07:00