Commit Graph

6228 Commits

Author SHA1 Message Date
Paul Westbrook
06aae17dfb Merge "Fix build" 2011-10-18 17:27:38 -07:00
Paul Westbrook
1aa2a0fce6 Fix build
Change-Id: Id4166d85ef85d10c7d60ba51f386ff5e01abcc79
2011-10-18 17:25:36 -07:00
Eric Fischer
470ed3c4f3 Merge "Import revised translations." 2011-10-18 16:30:21 -07:00
Eric Fischer
1675804839 Import revised translations.
Change-Id: Iadea51bf0544d439b438ea2cabf900684aac69c8
2011-10-18 15:40:14 -07:00
Marc Blank
3285fb3cfd Prevent NPE with badly-timed account deletion
Bug: 5473621
Change-Id: I0956540de0de172bc3519a301598e197b449b9a8
2011-10-18 13:27:30 -07:00
Eric Fischer
c36dcfbdb1 am 401a917d: (-s ours) Import revised translations. DO NOT MERGE
* commit '401a917dbf620e7a84c1fece78e7e80b1f39c496':
  Import revised translations.  DO NOT MERGE
2011-10-18 11:36:21 -07:00
Eric Fischer
401a917dbf Import revised translations. DO NOT MERGE
Change-Id: I6d23d0c5af0db4076a3be6a35e5d94d57beb44e5
2011-10-18 11:10:15 -07:00
Ben Komalo
1bc90d3ed9 Merge "Fix touch interceptions." 2011-10-17 15:20:45 -07:00
Ben Komalo
98c968d178 Fix touch interceptions.
We were unfortunately passing through all touches and never intercepting
events from the message ScrollView. This was desirable when the drag was
over the message content, but in the surrounding chrome it would lead to
pressed states while dragging, sometimes accidentally causing text
selection. This change makes that logic special cased to WebViews only.

Bug: 5361173
Change-Id: Icf535c015cec4a79a5ad7eba3d6c5aa7bd572a8a
2011-10-17 15:05:26 -07:00
Claudia de Veaux
e6c2156cee Restore Wi-Fi spelling.
Bug: 5163232

Change-Id: Ib37b05c3ca85474493546bd2f0bfd720cbffbfe6
2011-10-17 13:09:33 -07:00
Ben Komalo
2e3d46cbde Merge "Fix NPE in move messages" 2011-10-17 10:48:38 -07:00
Ben Komalo
30b49a0098 Merge "Fix widget update to properly refresh." 2011-10-17 10:30:51 -07:00
Ben Komalo
a007d79c3f Fix NPE in move messages
Bug: 5452020
Change-Id: Id8fca21692ad1a70a2114eaa7fec6bcecab6cab6
2011-10-16 18:13:38 -07:00
Ben Komalo
391dfa858a am 7e65b1fc: (-s ours) DO NOT MERGE: Fix hostname verifier for Exchange connections.
* commit '7e65b1fc1dead5256f165d367af30b850e43aec6':
  DO NOT MERGE: Fix hostname verifier for Exchange connections.
2011-10-14 15:43:10 -07:00
Ben Komalo
7e65b1fc1d DO NOT MERGE: 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.

Backported from: Ie4cba749aaf8c0fd9f9c43f09ebf354c6600d4f0
Bug: 5450563

Change-Id: Id1c80393d41068e6872ca5d42a3e5888805a3f09
2011-10-14 15:27:30 -07:00
Ben Komalo
561004883d Fix widget update to properly refresh.
Bug: 5413224
Change-Id: Id66c7dc8aac8b5e24c7d5c5b1633c9c3ab981b15
2011-10-14 14:33:27 -07:00
Ben Komalo
1f6769facc Merge "Always pop back to main app from widget." 2011-10-13 16:23:12 -07:00
Ben Komalo
28e496daef Respect system font size in message list.
- This makes dimensions according to scaled font sizes, and also resets
the activity properly (invalidating drawing caches) when that font size
happens.

Bug: 5287961
Change-Id: I04cf117b027befd6a065edeadf95187f62fffc8a
2011-10-13 15:54:14 -07:00
Claudia de Veaux
e3b56df151 Further cleanup of strings to match Gmail.
Bug: 5295455

Change-Id: I67a9a51f057e3d3126871cacf24985f8e66c8d20
2011-10-13 15:01:06 -07:00
Ben Komalo
3532e56591 Always pop back to main app from widget.
Bug: 5445267
Change-Id: I992a8a1c4402ba756787957766e8be3c68e064f8
2011-10-13 11:25:33 -07:00
Ben Komalo
7d1324a6df Merge "Keeps track of "last account used"" 2011-10-13 10:21:06 -07:00
Justin Ho
b3c9f85662 am 90f0dc7e: Updated multiple email notification icon Bug: 5222432
* commit '90f0dc7e3bbcd4eee6abefeca9b454a75eb8144e':
  Updated multiple email notification icon Bug: 5222432
2011-10-13 09:02:03 -07:00
Justin Ho
90f0dc7e3b Updated multiple email notification icon
Bug: 5222432

Change-Id: I20cd30a775db25e8bf0fa1dd4a8592a00a05f53b
2011-10-13 08:53:23 -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
47bf70cf7b Keeps track of "last account used"
This only applies for the main EmailActivity. The compose window still
uses the user-visible setting for "Default account" as the default
account when handling intents like "mailto:" links.

In the future, we should probably just remove that setting, now that we
remember the last account in the reading-email case.

Bug: 4460450
Change-Id: I4b3e7c9e13b7e89320891346383780cd670492ae
2011-10-12 17:16:19 -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
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
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
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
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