Andy Stadler
3be4698d52
am 907094eb
: am be6910e7
: Merge "Properly handle unsupported encryption policy" into honeycomb
...
* commit '907094ebe3dc4ed134f4f748bc463070647c6a3b':
Properly handle unsupported encryption policy
2011-01-19 12:07:38 -08:00
Andy Stadler
907094ebe3
am be6910e7
: Merge "Properly handle unsupported encryption policy" into honeycomb
...
* commit 'be6910e7a40b4bffb7e917ffa89c539733545548':
Properly handle unsupported encryption policy
2011-01-19 12:05:32 -08:00
Andy Stadler
be6910e7a4
Merge "Properly handle unsupported encryption policy" into honeycomb
2011-01-19 12:01:56 -08:00
Todd Kennedy
fcf8ced1c0
am 071e4358
: am 3db3e4b7
: widget combined inbox view only shows messages in inbox
...
* commit '071e435807d4532c42bf41caf030a117422d0567':
widget combined inbox view only shows messages in inbox
2011-01-19 12:01:15 -08:00
Todd Kennedy
071e435807
am 3db3e4b7
: widget combined inbox view only shows messages in inbox
...
* commit '3db3e4b795c08122d1c9d4fc105150231795448b':
widget combined inbox view only shows messages in inbox
2011-01-19 11:59:16 -08:00
Andy Stadler
a0d080558f
Properly handle unsupported encryption policy
...
* This fixes the case of:
* a device that does *not* support device encryption
* connecting to an account that *does* require device encryption
* but also supports "non-provisioned devices" (making the encryption
requirement optional.)
* Added unit test
Bug: 3367191
Change-Id: I894e68c4119a102dad02d2e0815fccdae1e87189
2011-01-19 11:40:48 -08:00
Todd Kennedy
3db3e4b795
widget combined inbox view only shows messages in inbox
...
instead of showing all messages (e.g. messages in drafts, etc...) the "combined
inbox" view now only messages in the inbox folder. This is now identical to
the "combined inbox" view available in the full email UI.
bug 3368613
Change-Id: I0080b56cd2718a3dce82b279277c63c4f43e86dc
2011-01-19 11:27:41 -08:00
Todd Kennedy
7b2500f934
am c364c96b
: am a5de96be
: Merge "Update widget colours / assets according to spec" into honeycomb
...
* commit 'c364c96bb07bc1cf9b2ccdce2199b7e2c970994c':
Update widget colours / assets according to spec
2011-01-19 11:07:43 -08:00
Todd Kennedy
c364c96bb0
am a5de96be
: Merge "Update widget colours / assets according to spec" into honeycomb
...
* commit 'a5de96be71610c6ad8c9b28554466bf4c09862f9':
Update widget colours / assets according to spec
2011-01-19 11:05:52 -08:00
Todd Kennedy
a5de96be71
Merge "Update widget colours / assets according to spec" into honeycomb
2011-01-19 11:03:18 -08:00
Marc Blank
eebcad7114
am 4cd93bd8
: am 0324017a
: Fix another case of HTML leakage in snippets
...
* commit '4cd93bd89dd3c51860504093df7462e9d295a3af':
Fix another case of HTML leakage in snippets
2011-01-19 11:02:47 -08:00
Marc Blank
4cd93bd89d
am 0324017a
: Fix another case of HTML leakage in snippets
...
* commit '0324017aa0a02b6b8381da00eaeb4a78879bb034':
Fix another case of HTML leakage in snippets
2011-01-19 11:00:49 -08:00
Marc Blank
0324017aa0
Fix another case of HTML leakage in snippets
...
* Add test for this case
Bug: 3285281
Change-Id: If45d33624ac5dbd16d28b45428be29e5a8c51046
2011-01-19 10:59:29 -08:00
Todd Kennedy
290fb65595
Update widget colours / assets according to spec
...
* Modified font colours for read/un-read emails
* Add chip colours when viewing mail from multiple accounts
* Add calendar icon if message has an invite attachment
* Update background of read/un-read emails
bug 3351761
Change-Id: Id59573d25a6988e9e869335f95778aad28b43912
2011-01-19 09:23:58 -08:00
Marc Blank
5ae735ae75
am 260ca593
: am 985155fd
: Merge "Fix regression re: bad folder sync key" into honeycomb
...
* commit '260ca5935ba1677123320f76a12642b1db2dd86a':
Fix regression re: bad folder sync key
2011-01-19 08:37:33 -08:00
Marc Blank
260ca5935b
am 985155fd
: Merge "Fix regression re: bad folder sync key" into honeycomb
...
* commit '985155fddd4735fa46d67e0d28fba704f459b25c':
Fix regression re: bad folder sync key
2011-01-19 08:35:33 -08:00
Marc Blank
985155fddd
Merge "Fix regression re: bad folder sync key" into honeycomb
2011-01-19 08:33:40 -08:00
Marc Blank
212a054804
Fix regression re: bad folder sync key
...
Bug: 3368400
Change-Id: I8bbba33ea0149b6c19a333dcd739208cec6c0475
2011-01-19 08:23:11 -08:00
Adam Cohen
2908701b93
am 861449ea
: am 1911a782
: Merge "Updating widget due to API changes." into honeycomb
...
* commit '861449ea998e4b8acab608d72e5dfa3dcd0a3903':
Updating widget due to API changes.
2011-01-18 23:12:27 -08:00
Adam Cohen
861449ea99
am 1911a782
: Merge "Updating widget due to API changes." into honeycomb
...
* commit '1911a782710d49fe31f2e3f9ceead5ee1c7a1905':
Updating widget due to API changes.
2011-01-18 23:09:55 -08:00
Adam Cohen
1911a78271
Merge "Updating widget due to API changes." into honeycomb
2011-01-18 23:07:47 -08:00
Andy Stadler
cbe5b30a8f
am 6d7f87b2
: am 98ea710d
: Add strings before string translation deadline
...
* commit '6d7f87b28e4b82c04f1c083ba18548bc4b58f151':
Add strings before string translation deadline
2011-01-18 22:02:33 -08:00
Marc Blank
714b07a3b1
am 65ee542b
: am 7a69ac78
: Merge "Don\'t report connection error when account isn\'t initialized" into honeycomb
...
* commit '65ee542b2cea9d347da4a30dd53928d2da1b2a88':
Don't report connection error when account isn't initialized
2011-01-18 21:58:48 -08:00
Eric Fischer
cd8a39b09f
am aad47f1d
: (-s ours) am 6fe0e87b
: Import revised translations. DO NOT MERGE
...
* commit 'aad47f1dfac66d5123e6ae210f954bf7bb0296bf':
Import revised translations. DO NOT MERGE
2011-01-18 21:55:40 -08:00
Andy Stadler
6d7f87b28e
am 98ea710d
: Add strings before string translation deadline
...
* commit '98ea710d1827ec0a21073c847736704059a730cb':
Add strings before string translation deadline
2011-01-18 18:45:16 -08:00
Andy Stadler
98ea710d18
Add strings before string translation deadline
...
Bug: 3301398 Phone->Android device in device admin setup screen
Bug: 3296594 email widget doesn't have a "tap to configure"
Bug: 2981433 should not trim leading/trailing spaces from passwords
Bug: 3360873 Attachment pre-caching should be a per-account setting
Bug: 3362752 Malformed message can prevent sync (error while decoding)
Change-Id: Ibed653987ccd5e0e1bd4e195f044c5c1cc06368f
2011-01-18 18:41:24 -08:00
Marc Blank
65ee542b2c
am 7a69ac78
: Merge "Don\'t report connection error when account isn\'t initialized" into honeycomb
...
* commit '7a69ac781b445a5895d31be83d190a2b6ee9fdc6':
Don't report connection error when account isn't initialized
2011-01-18 18:36:21 -08:00
Marc Blank
7a69ac781b
Merge "Don't report connection error when account isn't initialized" into honeycomb
2011-01-18 16:22:04 -08:00
Winson Chung
cb8a5544bf
Updating widget due to API changes.
...
Change-Id: I8623c48e912330145cfd325c962574d322ccc6f0
2011-01-18 15:31:17 -08:00
Eric Fischer
aad47f1dfa
am 6fe0e87b
: Import revised translations. DO NOT MERGE
...
* commit '6fe0e87b751af01b0e4008f93d0bc4b0612dde18':
Import revised translations. DO NOT MERGE
2011-01-18 15:17:04 -08:00
Eric Fischer
6fe0e87b75
Import revised translations. DO NOT MERGE
...
Change-Id: Ic576d5a1733b93eca24940f38c0b458910f4cba9
2011-01-18 15:05:44 -08:00
Marc Blank
aeea97275d
Don't report connection error when account isn't initialized
...
* We report uninitialized for updateFolderList when no mailboxes
have been created
Bug: 3235788
Change-Id: I337cfeac83bf320e8078e5a837976414fdd93e0f
2011-01-18 14:19:19 -08:00
Makoto Onuki
cfa8beddd1
am 3407d968
: Merge "Pixelperfect: message compose" into honeycomb
...
* commit '3407d9683ec98a61fe3680a7312c2e8193d6f369':
Pixelperfect: message compose
2011-01-18 11:19:29 -08:00
Makoto Onuki
f587b6cfa4
am f72f812f
: Merge "Use proper alert icons on dialogs" into honeycomb
...
* commit 'f72f812f5bb5d14940b2b161eec417a9aa6950f8':
Use proper alert icons on dialogs
2011-01-18 11:19:27 -08:00
Makoto Onuki
ee9e4978c1
am 6b21662b
: Merge "Remove STOPSHIPs regarding CloseTraceCursorWrapper" into honeycomb
...
* commit '6b21662ba8a76b9d713feda13e8da6ebb2b9745e':
Remove STOPSHIPs regarding CloseTraceCursorWrapper
2011-01-18 11:19:24 -08:00
Andy Stadler
b7012f47ec
am 946239e8
: Add per-account preference for bkgnd attachments
...
* commit '946239e8a0e01c628fae61894d3d48248b74cefc':
Add per-account preference for bkgnd attachments
2011-01-18 11:19:21 -08:00
Makoto Onuki
3407d9683e
Merge "Pixelperfect: message compose" into honeycomb
2011-01-18 11:09:02 -08:00
Makoto Onuki
f72f812f5b
Merge "Use proper alert icons on dialogs" into honeycomb
2011-01-18 11:08:56 -08:00
Makoto Onuki
6b21662ba8
Merge "Remove STOPSHIPs regarding CloseTraceCursorWrapper" into honeycomb
2011-01-18 11:08:51 -08:00
Andy Stadler
946239e8a0
Add per-account preference for bkgnd attachments
...
* Add flag to Account record
* Add checkbox to Account Settings (IMAP & EAS)
* Add checkbox to Account Setup (IMAP & EAS)
* Add flag to backup/restore logic
* Update Account & AccountSetupOptions unit tests
Bug: 3360873
Change-Id: I0c407776ede4110f33716644f6f027938f21130a
2011-01-18 10:53:37 -08:00
Makoto Onuki
9fd050e162
Pixelperfect: message compose
...
- Use the fixed margin in portrait, as opposed to the fixed width we use
in landscape.
- Add 16 dip bottom margin for both landscape and portrait.
Bug 3335094
Change-Id: I082380048256aeef67673ed1b961af279fe2e702
2011-01-18 10:45:06 -08:00
Makoto Onuki
49518bb360
Use proper alert icons on dialogs
...
Bug 3364447
Bug 3241281
Change-Id: Ie791d8d5eae26a848de08658a14d6a09d06d0846
2011-01-18 10:17:23 -08:00
Makoto Onuki
80a2e9109d
Remove STOPSHIPs regarding CloseTraceCursorWrapper
...
The loader crash seems to have been gone.
Bug 3335072
Bug 3335067
Change-Id: Iefc5367e6e394840687b0c2c4f6b75f8e9661d26
2011-01-18 10:04:14 -08:00
Todd Kennedy
f56bd56d85
am f264ea63
: Fix widget alignment
...
* commit 'f264ea638d127ed5558d70f4f89a4c1c8db60f0a':
Fix widget alignment
2011-01-18 09:47:55 -08:00
Todd Kennedy
f264ea638d
Fix widget alignment
...
bug 3349605
Change-Id: Ia56f588067080c13716ff2fe6ffe623c6a940b05
2011-01-18 09:45:15 -08:00
Todd Kennedy
a9f419f88c
am 2b6d0072
: Do not automatically open attached files after saving
...
* commit '2b6d0072df67a1d85ed9da29d1a4ed26fcd86ecd':
Do not automatically open attached files after saving
2011-01-18 08:50:02 -08:00
Todd Kennedy
2b6d0072df
Do not automatically open attached files after saving
...
After saving an attachment, we no longer automatically start the activity
associated with the attachment mime type. However, we still run the media
scanner to add supported media (e.g. music, pictures, etc...) to the media
content provider.
bug 3266378
Change-Id: I96985438316a33322437ff009fe7e9c597b1c70a
2011-01-18 08:46:53 -08:00
Dianne Hackborn
580da738a4
am 31e25767
: Follow API changes.
...
* commit '31e25767918193217c884db72aaa98e50a4957d3':
Follow API changes.
2011-01-17 20:00:38 -08:00
Dianne Hackborn
31e2576791
Follow API changes.
...
Change-Id: I1ca0fe365b953fa98a462912309a1c9647277ba7
2011-01-17 16:24:00 -08:00
Marc Blank
e1f4b34b6d
am 648e4517
: Merge "Read truncated data (even if it doesn\'t get parsed)" into honeycomb
...
* commit '648e45176bd516d4712c069691999ab762b70e82':
Read truncated data (even if it doesn't get parsed)
2011-01-17 15:26:04 -08:00