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
e06a758dcf
am 3285fb3c
: Prevent NPE with badly-timed account deletion
...
* commit '3285fb3cfdb209257ed5fb8f36a4d98c67b0d53e':
Prevent NPE with badly-timed account deletion
2011-10-18 14:12:54 -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
2f04e2ca11
am c36dcfbd
: (-s ours) am 401a917d
: (-s ours) Import revised translations. DO NOT MERGE
...
* commit 'c36dcfbdb10a1abe350c8aaa91595036ce68fb6f':
Import revised translations. DO NOT MERGE
2011-10-18 11:39:05 -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
c417685e85
am 1bc90d3e
: Merge "Fix touch interceptions."
...
* commit '1bc90d3ed9f7749a1de1d80dc588e3a1194fb887':
Fix touch interceptions.
2011-10-17 15:22:17 -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
388fb4663f
am e6c2156c
: Restore Wi-Fi spelling. Bug: 5163232
...
* commit 'e6c2156ceed4b95befaec1c9de742fa44935cdbc':
Restore Wi-Fi spelling. Bug: 5163232
2011-10-17 14:56:36 -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
85f17d05ed
am 2e3d46cb
: Merge "Fix NPE in move messages"
...
* commit '2e3d46cbde7a04211e7fbecb9f0836aac7bc22ba':
Fix NPE in move messages
2011-10-17 10:50:08 -07:00
Ben Komalo
2e3d46cbde
Merge "Fix NPE in move messages"
2011-10-17 10:48:38 -07:00
Ben Komalo
0579afe7c7
am 30b49a00
: Merge "Fix widget update to properly refresh."
...
* commit '30b49a009821be16afad2bb7928fda4d045bf68e':
Fix widget update to properly refresh.
2011-10-17 10:32:02 -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
ead61a8df4
am 391dfa85
: (-s ours) am 7e65b1fc
: (-s ours) DO NOT MERGE: Fix hostname verifier for Exchange connections.
...
* commit '391dfa858abb62d2a7fa047e22710efafe9e8271':
DO NOT MERGE: Fix hostname verifier for Exchange connections.
2011-10-14 15:45:40 -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
627c295f35
am 1f6769fa
: Merge "Always pop back to main app from widget."
...
* commit '1f6769faccad7691bcf2a5369ce373725e0dc0e1':
Always pop back to main app from widget.
2011-10-13 16:24:35 -07:00
Ben Komalo
1f6769facc
Merge "Always pop back to main app from widget."
2011-10-13 16:23:12 -07:00
Ben Komalo
03ab4d7c38
am 28e496da
: Respect system font size in message list.
...
* commit '28e496daef8be15def1de3787845a22bed0c8b79':
Respect system font size in message list.
2011-10-13 16:19:49 -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
4bf422fa4b
am e3b56df1
: Further cleanup of strings to match Gmail. Bug: 5295455
...
* commit 'e3b56df15101b8d29d9ceb81bf57f923774e36e6':
Further cleanup of strings to match Gmail. Bug: 5295455
2011-10-13 15:45:21 -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
55f91097de
am 7d1324a6
: Merge "Keeps track of "last account used""
...
* commit '7d1324a6df00caa50b18c6937ddbf5ecac5d55c2':
Keeps track of "last account used"
2011-10-13 10:23:21 -07:00
Ben Komalo
7d1324a6df
Merge "Keeps track of "last account used""
2011-10-13 10:21:06 -07:00
Justin Ho
2aa88d600b
am b3c9f856
: am 90f0dc7e
: Updated multiple email notification icon Bug: 5222432
...
* commit 'b3c9f856622789ab74700a1767f1267e61d9b5cb':
Updated multiple email notification icon Bug: 5222432
2011-10-13 09:03:19 -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
deba124011
am 223267f7
: Merge "Fix per account starred mailboxes."
...
* commit '223267f7019b97d14cc18158f57ddf05d07361ab':
Fix per account starred mailboxes.
2011-10-12 21:11:52 -07:00
Ben Komalo
141e41404f
am 172d05da
: am 4d3f3f3a
: Fix hostname verifier for Exchange connections.
...
* commit '172d05da23a70736bba75f15a549152a82ff118b':
Fix hostname verifier for Exchange connections.
2011-10-12 20:43:05 -07:00
Mindy Pereira
523212dd02
am 1dd5475e
: Remove styles provided by mailcommon.
...
* commit '1dd5475ecf7a70159894f6fdb0b60ca7d789eeab':
Remove styles provided by mailcommon.
2011-10-12 20:01:07 -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
c27214823c
am 186b9a89
: Update to mail common styles. Also updated compose hint text.
...
* commit '186b9a89b5d580ce132369ca476709f64f5fb452':
Update to mail common styles. Also updated compose hint text.
2011-10-12 12:38:03 -07:00
Mindy Pereira
156ee3f300
am 6b71a9d9
: Merge "Use styles in the mailcommon directory for the compose view."
...
* commit '6b71a9d9e3152068d05072ba4abc2b6f9188dba8':
Use styles in the mailcommon directory for the compose view.
2011-10-12 12:37:19 -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
c8ca673106
am 160bbc82
: Merge "Don\'t show "mailbox not found" toast on "back""
...
* commit '160bbc8288e21eec9148dc0add7ac7c9bc998e5c':
Don't show "mailbox not found" toast on "back"
2011-10-11 13:01:18 -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