Commit Graph

6298 Commits

Author SHA1 Message Date
The Android Automerger
8e651781d3 merge in ics-release history after reset to master 2011-10-13 07:00:31 -07:00
Ben Komalo
223267f701 Merge "Fix per account starred mailboxes." 2011-10-12 19:45:12 -07:00
Ben Komalo
513486cfb5 Fix per account starred mailboxes.
We always switched to combined view when we tapped "Starred" in a
mailbox list. This was confusing since tapping to show the mailbox list
will take you to the mailbox list for the combined view, even if there's
only one account on the device! Other confusing things happened like
showing coloured account chips, even if there's only one account.

This fixes it so that we pass the account ID when building the
selection. Lots of wiring to make it happen, but very little change
overall.

Bug: 5388326
Change-Id: I1fe52f211cceca0c1b26581e200f3c7adcd0734a
2011-10-12 19:44:39 -07:00
Ben Komalo
172d05da23 am 4d3f3f3a: Fix hostname verifier for Exchange connections.
* commit '4d3f3f3ab95c03d4c1ab308801b92ba1d9df2276':
  Fix hostname verifier for Exchange connections.
2011-10-12 14:28:53 -07:00
Ben Komalo
4d3f3f3ab9 Fix hostname verifier for Exchange connections.
When the socketfactory init code was moved, I forgot to re-add in the check
to skip hostname verification. This made "Trust all SSL certificates"
checkbox useless.

Bug: 5450563
Change-Id: Ie4cba749aaf8c0fd9f9c43f09ebf354c6600d4f0
2011-10-12 13:41:59 -07:00
Mindy Pereira
1dd5475ecf Remove styles provided by mailcommon.
Change-Id: I0de3d171fee19e428176b9819e9683c70c1d30d3
2011-10-12 09:30:36 -07:00
The Android Automerger
d657f710af merge in ics-release history after reset to master 2011-10-12 07:00:56 -07:00
Mindy Pereira
186b9a89b5 Update to mail common styles. Also updated compose hint text.
Change-Id: I4851ff148371b17b86bb1364bc0543c7e3c1f99b
2011-10-11 14:50:16 -07:00
Mindy Pereira
6b71a9d9e3 Merge "Use styles in the mailcommon directory for the compose view." 2011-10-11 14:19:08 -07:00
Marc Blank
160bbc8288 Merge "Don't show "mailbox not found" toast on "back"" 2011-10-11 12:59:22 -07:00
Marc Blank
d9cdd88702 Don't show "mailbox not found" toast on "back"
* We'll only show this on a first load of the
  MessageListFragment

Bug: 5396997
Change-Id: I9a93bfd6e2c31d1ed8f75f1ec486da060712dffd
2011-10-11 12:04:11 -07:00
Mindy Pereira
f5ac3c6901 Use styles in the mailcommon directory for the compose view.
Change-Id: Ib14f99355a78bb00aa06c87ae6329940f5d66444
2011-10-11 10:57:57 -07:00
The Android Automerger
8ff5e9cefc merge in ics-release history after reset to master 2011-10-11 05:34:02 -07:00
Ben Komalo
2949d48f1d Merge "Up Email version for release." 2011-10-10 15:42:33 -07:00
Mindy Pereira
51c4a901b6 Merge "Move next and manual settings buttons up on the add acct screen." 2011-10-10 14:00:19 -07:00
Mindy Pereira
2bb9b63c2c Move next and manual settings buttons up on the add acct screen.
Fixes bug:5397033 IME overlaps Next button in Add Account screen

Change-Id: Icec368040d1a1f7f02f5c164167f7b5f29c450c9
2011-10-10 13:56:56 -07:00
Ben Komalo
9ac7e04fb7 Up Email version for release.
Bug: 5392379
Change-Id: I6b7082bb12d4f9a9b18064b0933f5ed588af9afe
2011-10-10 11:38:16 -07:00
Mindy Pereira
18601838be Merge "Allow tablet to use different styles than phone for chips fields." 2011-10-10 11:07:33 -07:00
Eric Fischer
2f92d8f208 Merge "Import revised translations." 2011-10-10 10:30:46 -07:00
Mindy Pereira
b291d7cd24 Allow tablet to use different styles than phone for chips fields.
Fixes bug:5390583 To,CC & BCC field titles are aligned middle of the row in Email

Change-Id: Ia44ae510d740101d1cbbf1c59f233a2cd9d9af99
2011-10-10 10:13:09 -07:00
The Android Automerger
8ac6f2d37c merge in ics-release history after reset to master 2011-10-09 07:01:04 -07:00
Ben Komalo
c35c4b14c9 Fix persistent "empty name" error.
We were never clearing the error state when typing in a field that
needed to be non-empty.

Bug: 5422268
Change-Id: Iabe8c6f6c348b4210695c3eeff98e79e60f83d08
2011-10-07 18:03:16 -07:00
Eric Fischer
e868673dc5 Import revised translations.
Change-Id: I4a0fd7027989deeba8f835bc8f6c2332319122e5
2011-10-07 16:41:16 -07:00
Ben Komalo
dbd2aeda76 Fix up compose styles.
- make subject text have the proper text flags
- remove unneeded v13 overlay, and fix the main style to not have
DarkActionBar (which is wrong)

Bug: 5430026
Change-Id: I44d72f89118f03be89ed3ea1a5516321798d9fa1
2011-10-07 15:02:02 -07:00
Ben Komalo
6e8e49d5f7 Merge "Ensure proper mailbox is highlighted." 2011-10-07 11:12:26 -07:00
Ben Komalo
7e984e8c0b Merge "Fix message list pressed state color" 2011-10-07 11:05:58 -07:00
Ben Komalo
ce4ebc52a6 Ensure proper mailbox is highlighted.
Bug: 5424565
Change-Id: I1436568aa1c7d7d2becce27ee068d88deb217496
2011-10-06 17:31:59 -07:00
Ben Komalo
f9b566c109 Fix message list pressed state color
Also do some cleanup - we were creating a background task for opening a
message, when in the common case we don't need to hit disk for any
reason. This was also an issue since the async opening of the message
caused the list item to go into an "active" state, changing its colour
(this problem still exists in starred view now, though)

Bug: 5222509
Change-Id: Ie94109df42406fd6eec1e1255bb0827626ba0628
2011-10-06 16:35:04 -07:00
The Android Automerger
01dee073a2 merge in ics-release history after reset to master 2011-10-06 07:01:09 -07:00
Ben Komalo
cc5ccc68fc Merge "Don't spell check account names." 2011-10-05 16:24:34 -07:00
Ben Komalo
65510b6fb9 Don't spell check account names.
note that this applies for the account name.
the actual user name has inputType=textPersonName, which I guess the
framework folks have decided should be spellchecked, so I'm leaving that
as is

Bug: 5418912
Change-Id: Ie39aa64e59940415b4d8d9a275af07c902937234
2011-10-05 16:14:44 -07:00
Ben Komalo
d43f444710 Use holo light for shortcut/widget pickers
Bug: 5418974
Change-Id: Ied745d9ffa74b824a71f4eba54138739e94c4a64
2011-10-05 16:00:44 -07:00
The Android Automerger
1072ebca03 merge in ics-release history after reset to master 2011-10-05 06:59:17 -07:00
Claudia de Veaux
03e32770f5 Merge "General string cleanup per standards. Bugs: 5383037, 5165745, 5163232, 5162668, 5162667, 5162328 Changes include making text friendlier, more consistent use of wording, capitalization, punctuation, simplification of dialogs. Changed spelling of Wi-Fi to WiFi." 2011-10-04 17:09:01 -07:00
Claudia de Veaux
f314e2e5c0 General string cleanup per standards.
Bugs: 5383037, 5165745, 5163232, 5162668, 5162667, 5162328
Changes include making text friendlier, more consistent
use of wording, capitalization, punctuation, simplification
of dialogs. Changed spelling of Wi-Fi to WiFi.

Change-Id: I6d1656416d1844fc361bbedc1d7e98cb5cc8af6e

Revision based on review feedback from Ben.
2011-10-04 17:02:24 -07:00
Ben Komalo
ab5ac4fd00 Fix widget padding.
Makes text vertically and horizontally centered
Also makes it more robust to text size changes

Bug: 5406487
Bug: 5360657
Change-Id: I5183c988163381237cf3aa38121075b7281df695
2011-10-04 16:23:45 -07:00
Marc Blank
cd75eef4de Merge "Handle possible NPE in MessageListItem" 2011-10-04 13:41:08 -07:00
Marc Blank
bcf5d5825f Handle possible NPE in MessageListItem
* I don't know how the timestamp can be zero for a message, but we
  shouldn't crash, and it's late for adding new localizable text

Bug: 5410814
Change-Id: Idf1c8b0d4c0b7e0e2b2466643ea52e5244d1bb5f
2011-10-04 13:36:47 -07:00
The Android Automerger
e514a1e47b merge in ics-release history after reset to master 2011-10-04 07:00:29 -07:00
Ben Komalo
1c4b62a0ed Merge "Always update adapter's cursor." 2011-10-03 17:15:11 -07:00
Marc Blank
35d92429af Merge "Enforce "auto-sync app data" setting for POP3/IMAP" 2011-10-03 14:21:04 -07:00
Ben Komalo
1259ba0258 Merge "Don't touch views in the background." 2011-10-03 13:55:40 -07:00
Ben Komalo
5aedd25869 Always update adapter's cursor.
In cases where the account gets removed, we accidentally hold a stale
cursor. This leaves a ticking bomb, which generally explodes when the
list tries to save state.

Bug: 5367199
Change-Id: Ibcd0c281c9668778f7d1d2abba472ffff8b22879
2011-10-03 13:53:24 -07:00
Eric Fischer
151037ec33 Import revised translations.
Change-Id: I0560d5aa478c7878a67e3047237d39a05676768e
2011-10-03 13:42:00 -07:00
Marc Blank
faf9ecc992 Enforce "auto-sync app data" setting for POP3/IMAP
* We were using the deprecated ConnectivityManager for this; we should now be
  using the setting in ContentResolver
* Also, remove broadcast receiver code that is no longer relevant

Bug: 5405352
Change-Id: I985a95071aea92d235a2708925f775b817ba2328
2011-10-03 13:05:24 -07:00
Ben Komalo
d75ac0d357 Don't touch views in the background.
Bug: 5404366
Change-Id: I8aca89c032db41aaf95d3a94dc8047fbacbd47a9
2011-10-03 12:58:58 -07:00
The Android Automerger
b4d5cf2655 merge in ics-release history after reset to master 2011-10-03 07:00:47 -07:00
Eric Fischer
1d8302e88b Merge "Restore deleted string still referenced from layout." 2011-09-30 15:53:15 -07:00
Eric Fischer
ec475fd6fb Restore deleted string still referenced from layout.
Change-Id: Ie2a009bf0ae3c5a41ae7dad455ab8a65f74ff3d6
2011-09-30 15:48:53 -07:00
Marc Blank
71c9683087 Improve policy logging
Change-Id: I023b7c5302ea00ab77edd697009fb00544951a80
2011-09-30 15:00:25 -07:00