Commit Graph

6198 Commits

Author SHA1 Message Date
The Android Automerger
8fc0566911 merge in ics-release history after reset to master 2011-09-15 06:34:54 -07:00
Ben Komalo
82c956414b Up Email version for release.
Bug: 5280784
Change-Id: Ifc6b2ca2209053196e8db62e224553970adeda45
2011-09-14 18:16:49 -07:00
Marc Blank
5602ba92a0 Merge "Allow multiple wildcards in providers.xml; add hotmail domains" 2011-09-14 17:06:22 -07:00
Marc Blank
1b65e834c3 Allow multiple wildcards in providers.xml; add hotmail domains
* Change handling of the providers.xml file to allow asterisk
  as a placeholder for an individual domain name part
  (the previous behavior was a very greedy wildcard)
* Add hotmail aliases using the new scheme
* Update unit tests

Bug: 5318329
Change-Id: I73a0dfcb956830b18c5460a1b3ddfc58459d08c9
2011-09-14 16:59:02 -07:00
Ben Komalo
5d44feaf30 Add msgid tags for last minute messages.
Change-Id: I0e46ff72ef5831d999ea1a5249d99ac92a716f55
2011-09-14 16:10:30 -07:00
Michael Chan
bfbf0dd853 Add setting for ReplyAll
Also show/hide the right icon and item in overflow menu depending on setting

Bug: 5298445
Change-Id: I950025cab0aeb57d18769b137eeca418d581c5f9
2011-09-14 16:00:56 -07:00
Ben Komalo
b0f52fdc1d Fix settings padding.
Bug: 5297935
Change-Id: Ibcf1cc848803d8e591d9a8eb84c77eacbc4cc89c
2011-09-14 13:27:12 -07:00
The Android Automerger
f2599f7274 merge in ics-release history after reset to master 2011-09-14 06:34:36 -07:00
Ben Komalo
2c57e7036d Fix upgrade code.
In HC MR2 we introduced a column for a parentKey, but AFAICT, did not
use it. It was populated with a null value. The first upgrade code in
ICS assumed it was '0' which failed to upgrade it properly.

This prevents IMAP accounts from being broken when upgrading from GB ->
ICS.

Bug: 5252620
Change-Id: I000253b7c02ac1706710bdb21a820293f09cbea5
2011-09-13 17:18:34 -07:00
Ben Komalo
715ee4ec4c Wire a custom error code for cert errors
This addesses UX's #1 concern about the UX flow for servers that require
certs - users don't know what to do after an error, so they want to kick
them into the certificate selection flow.

Bug: 5280071
Change-Id: I566707b9e680b3ef0b4c0cc8a07a8ad2c825ecaa
2011-09-13 14:08:44 -07:00
Ben Komalo
3d0f0d74b0 Text changes for consistency
Bug: 5280071
Change-Id: I6953128388a06b26e5f079450174caff85f08c2d
2011-09-13 10:02:26 -07:00
The Android Automerger
ef8fc8439a merge in ics-release history after reset to master 2011-09-13 06:34:34 -07:00
Ben Komalo
93f2b61d8e Merge "Tweak message header actions." 2011-09-12 13:03:46 -07:00
Ben Komalo
afdec1caf1 Tweak message header actions.
Once again, I missed an asset in the drop, since there is actually a
sepcialized one for the message view.

Also, use styles to fill out the entire height to the header to make the
touch targets bigger, as consistent with Gmail.

Bug: 5290357
Change-Id: I6754b3ef986dbf57c7c68bc595cf54cc9d76123a
2011-09-12 12:39:30 -07:00
Eric Fischer
bc96b6a9d9 Merge "Import revised translations." 2011-09-12 10:20:59 -07:00
Eric Fischer
78d722fe2c Import revised translations.
Change-Id: I7740ad2764b854e9112110556d3c56854b4ea67c
2011-09-12 09:51:37 -07:00
The Android Automerger
632c104c4b merge in ics-release history after reset to master 2011-09-11 06:42:11 -07:00
Justin Ho
db8caf745b Merge "Updated Email launcher icon Bug: 5286988" 2011-09-09 17:21:39 -07:00
Ben Komalo
25cd8b05e4 Fix message list backgrounds in wide mode.
The final asset drop renamed things to conversation_wide and I had
missed this case for the unread states (the rename went fine for the
read case). As a result, we didn't actually import the new unread states
for wide mode.

Bug: 5286632
Change-Id: I5b1f4120ce42ff50d713706c319260ff57274648
2011-09-09 16:25:06 -07:00
Justin Ho
c8bfd5bace Updated Email launcher icon
Bug: 5286988

Change-Id: I7b97e833f2807fe10ac8fdb9db640826b1655fe5
2011-09-09 15:59:33 -07:00
Justin Ho
235e809ba4 Updated Email widget dimens
Bug: 5278970

Change-Id: I6bd4a29eead8ff6a7dfaf8a7a502bab7a6fc14a8
2011-09-09 13:34:12 -07:00
Justin Ho
b5873b9f2b Updated Email widget dimens
Bug: 5278970

Change-Id: I6bd4a29eead8ff6a7dfaf8a7a502bab7a6fc14a8
2011-09-09 08:52:18 -07:00
Mindy Pereira
3d5581d8b9 Update compose styles for chips and other fields.
Fixes bug:5278687 update email compose to match gmail compose
Change-Id: I90ce594abd6c8e7215880eb12927f01ba6e985a8
2011-09-08 13:34:57 -07:00
The Android Automerger
f4b9d1e4dd merge in ics-release history after reset to master 2011-09-07 06:34:39 -07:00
Eric Fischer
e7e04343ae Merge "Import revised translations." 2011-09-06 12:00:38 -07:00
Marc Blank
b169192c8a Update account object in Policy#setAccountPolicy
* We weren't updating the account object passed in to setAccountPolicy,
  which is problematic if the object is cached and used subsequently
  in the code (it would have stale policy values)

Bug: 5245056

Change-Id: I279570dfd66c4a65d751f73e2e56578be186d339
2011-09-06 10:46:49 -07:00
The Android Automerger
cf11a0d7d9 merge in ics-release history after reset to master 2011-09-02 16:02:56 -07:00
Eric Fischer
2abbf2baac Import revised translations.
Change-Id: I3b0a80007bda82e873c7757c4a30d3a23e3643d1
2011-09-02 14:48:12 -07:00
Ben Komalo
891da84a25 Misc visual fixes to Email
- dropped in bigger assets for mailbox triangle
- dropped in bigger assets for checkbox for xhdpi
- dropped in proper star asset for message list
- fixed some padding issues for message list item
- remove the color label from "Combined view" in the account drop down

Bug: 5248125
Change-Id: Ic15d98013f2afb42bf55c327654009ef8baa1b78
2011-09-01 16:51:02 -07:00
Ben Komalo
cbaaa85aba Merge "increase MessageListItem touchslop" 2011-09-01 11:07:08 -07:00
Justin Ho
50167273af Unused assets removed from Email
Bug: 5032006

Change-Id: Ia43a54e1a6f0c029cc9c15a5aa7d6f201a814e4e
2011-09-01 08:50:22 -07:00
The Android Automerger
5ba86baed6 merge in ics-release history after reset to master 2011-09-01 06:34:20 -07:00
Ben Komalo
2076fa7a3b increase MessageListItem touchslop
Bug: 5237832
Change-Id: Ic651cb23b25041195a226a301b9111c5e8d831ec
2011-08-31 14:06:41 -07:00
Ben Komalo
c3249d8f34 Ensure we can pan around in two directions.
This introduces a ScrollView that doesn't "lock" scrolling in one
direction, which makes it really difficult to view messages on a phone.

Bug: 5039459
Change-Id: I75e6824952c843140844873bec77af55b194f776
2011-08-31 14:03:29 -07:00
The Android Automerger
84213f0015 merge in ics-release history after reset to master 2011-08-31 06:34:24 -07:00
Ben Komalo
b7d137bfb6 Refresh account list in settings.
Since account deletion is async, the deleted account still shows up for
a split second. We can do something smarter about this later, but not
for ICS, and not worth it for such a rare event

Bug: 5116203
Change-Id: I82cced09b7a098e4a1a960f2d8ad75c1979b0649
2011-08-30 16:25:42 -07:00
Ben Komalo
f97ec4d1e8 Hide search icon in search mode.
This is a kludge - the real solution is to use the proper action modes
in the framework. That's too large to do this late.

Bug: 5232787
Change-Id: I76b68b250c384bdabf51e8831f833afd65c0c73b
2011-08-30 14:57:21 -07:00
The Android Automerger
ef02dd91a8 merge in ics-release history after reset to master 2011-08-30 13:42:53 -07:00
Ben Komalo
8466f79a06 Asset drop.
- this syncs up the UX repo with the developer repo so that the assets
now match. We should be able to do wholesale drops/diffs from now on.
- lots of changes to widget so that it is (mostly) up to spec now, and
matches the preview

Bug: 5225385
Bug: 5205578
Bug: 4320895
Change-Id: I8ccbadcfc17cdb406599497edc91165809f55d68
2011-08-30 12:57:38 -07:00
The Android Automerger
49f75bb496 merge in ics-release history after reset to master 2011-08-30 12:45:52 -07:00
The Android Automerger
1f5d1c3f48 merge in ics-release history after reset to master 2011-08-30 06:34:24 -07:00
Marc Blank
3170153d16 Merge "Throw RuntimeExceptions when PolicyService calls fail" 2011-08-29 16:21:42 -07:00
Marc Blank
c28fdfeaad Throw RuntimeExceptions when PolicyService calls fail
* Rather than returning false, which can cause unexpected
  results, e.g. locking out an account until reboot
* Partial fix for the referenced bug (there might be other
  causes)

Bug: 5221119
Change-Id: I5b47093a3411deb6995624887197297323db0d2d
2011-08-29 16:18:50 -07:00
Marc Blank
b946263f45 Merge "Password history changes do NOT require user intervention" 2011-08-29 16:09:51 -07:00
Mindy Pereira
149e3ed9bd Merge "fix height of compose view fields" 2011-08-29 09:38:49 -07:00
Mindy Pereira
cc02d435b2 fix height of compose view fields
fixes bug:5223556 heights of compose view text fields are too tall on phone/ tablet

Change-Id: I1bbf570a66a424cffcabcae6cfdc2b6ca05be4b7
2011-08-29 08:45:47 -07:00
The Android Automerger
a46c54bbc4 merge in ics-release history after reset to master 2011-08-29 06:34:23 -07:00
Marc Blank
e86d8af163 Password history changes do NOT require user intervention
* A change in history requirement is not intended to force a new
  password immediately; we just tell the DPM what the new
  requirement is...
* This is one cause of the below-referenced bug

Bug: 5221119
Change-Id: I890b42d4eab4fbd9d34665fbea138f179d5d3215
2011-08-28 16:34:28 -07:00
Marc Blank
9bcdd58a09 Merge "Be careful before setting account's delete policy" 2011-08-26 18:43:34 -07:00
Nick Pelly
1f1ead8d76 Merge "Update for NDEF push API change." 2011-08-26 17:31:57 -07:00