Commit Graph

6660 Commits

Author SHA1 Message Date
The Android Automerger
dd05a04499 merge in ics-mr1-release history after reset to ics-mr1 2011-10-26 07:05:32 -07:00
Marc Blank
ad921d01ca Merge "Rewrite of security policy handling and service code" 2011-10-25 14:24:14 -07:00
Ed Heyl
565b4ce99a merge ics-mr0
Change-Id: I83fecd4af7a696e44aa6e7ec17afc390ff61b941
2011-10-25 20:16:55 +00:00
Eric Fischer
9951117fdb Merge "Import revised translations." 2011-10-25 11:43:53 -07:00
Eric Fischer
acb76eabfe Import revised translations.
Change-Id: I181f6442c9be611e5c8d2086bc13621a3b26f1a0
2011-10-25 10:50:19 -07:00
Marc Blank
2736c1a11c Rewrite of security policy handling and service code
* Remove PolicyService APIs policiesRequired, policiesUpdated,
  isSupported, clearUnsupportedPolicies, and isActiveAdmin
* Add PolicyService API setAccountPolicy, which is the sole
  method by which security policies are promulgated
* Add protocolPoliciesEnabled and protocolPoliciesUnsupported
  to the Policy class; these are packed, localized strings
  indicating policies that the protocol itself have enabled
  and/or cannot support (i.e. these are policies that are
  unknown to the DPM, e.g. don't load attachments)
* Differentiate in security notifications between three kinds
  of policy changes - changes that don't require user
  intervention (e.g. reducing requirements), changes that
  require user intervention (the legacy notification), and
  changes that make the account unsyncable (e.g. the server
  adding an unsupportable policy). Handle all possible policy
  changes cleanly.
* Make security notifications per account (with multiple
  accounts, notifications would get arbitrarily munged)
* Expose ALL enforced policies via the account settings
  screen in two categories: policies enforced (including
  both policies enforced by the DPM and policies enforced
  by the protocol) and policies unsupported (note that these
  can only be seen if policies are changed after an account
  is created; we do not allow the creation of an account
  when any required policies are unsupported).  Add a
  button that forces a sync attempt, for accounts that
  are locked out, but whose policies have changed on
  the server (this would otherwise require a reboot).
* Updated unit tests

Bug: 5398682
Bug: 5393724
Bug: 5379682
Change-Id: I4a3df823913a809874ed959d228177f0fc799281
2011-10-25 10:32:34 -07:00
Eric Fischer
d6630f9ca9 Merge "Restore deleted string still referenced from layout." 2011-10-25 10:09:13 -07:00
Eric Fischer
731255f3bc Restore deleted string still referenced from layout.
Change-Id: Iee1b78c76f8ac3065ad5a0444d6f7033d746f626
2011-10-24 17:43:19 -07:00
Eric Fischer
0e6685c97b am 017b062b: (-s ours) Import revised translations. DO NOT MERGE
* commit '017b062b189b029ee3de09528669dbb4c35783de':
  Import revised translations.  DO NOT MERGE
2011-10-24 17:03:57 -07:00
Eric Fischer
017b062b18 Import revised translations. DO NOT MERGE
Change-Id: I5a3d8ce3b33cfbc3756bdcefa599e4c75f335df6
2011-10-24 16:49:50 -07:00
The Android Automerger
592b9b818c merge in ics-release history after reset to master 2011-10-23 07:02:04 -07:00
Marc Blank
6629f6b67c Merge "onMove in CachedCursor shouldn't call the underlying cursor's method" 2011-10-21 17:57:52 -07:00
Eric Fischer
51de134069 am 26e92897: (-s ours) Import revised translations. DO NOT MERGE
* commit '26e928971c432e4462136e67ee1dae328306f9d6':
  Import revised translations.  DO NOT MERGE
2011-10-21 16:02:27 -07:00
Ben Komalo
037e00b97d Merge "Disable widget creation if there're no accounts" 2011-10-21 14:53:23 -07:00
Ben Komalo
ee8b4cf7ff Merge "Make Email widget more accessible." 2011-10-21 14:52:51 -07:00
Ben Komalo
d94522c6d9 Make Email widget more accessible.
Bug: 5480096
Change-Id: I58fe6bd070c7d8058f2a920012c3260bfed614b9
2011-10-21 14:50:42 -07:00
Eric Fischer
26e928971c Import revised translations. DO NOT MERGE
Change-Id: Ic07cf6a78fdead82547796bfae87288c4cfd3627
2011-10-21 14:38:48 -07:00
Eric Fischer
a8eb9c462d am 805aca21: (-s ours) Import revised translations. DO NOT MERGE
* commit '805aca21ec16b744feb2939167955153cbf9e557':
  Import revised translations.  DO NOT MERGE
2011-10-21 13:59:14 -07:00
Marc Blank
8919237f34 Merge "Fix findExistingAccount to treat underscore properly" 2011-10-21 11:30:42 -07:00
Ben Komalo
227514c1cf Remove stale strings in widget.
We can't tap to configure anymore, at least not according to the old
method.

Bug: 5451924
Change-Id: I997e96a9bab36aecf68a5daeedff6e7442a848a4
2011-10-21 11:19:34 -07:00
Ben Komalo
7958ce59e6 Unused assets removed from Email
Change-Id: I347b733a28deffccdcdc0368fbf87aed71e0d95b
2011-10-21 09:10:27 -07:00
Ben Komalo
1fb0b605e2 Merge "Request focus in field when cc/bcc is toggled." 2011-10-21 08:38:32 -07:00
Ben Komalo
d69fab905d Prevent insert quick response crash.
Monkeys can click really fast, before the data is finished loading.

Bug: 5067086
Change-Id: I7f9248b0fb694a83ecb793570b2a17f91a49ad85
2011-10-21 08:23:26 -07:00
Ben Komalo
ea73911291 Disable widget creation if there're no accounts
Bug: 4571798
Change-Id: I4b496c12b6c8a2123f9b3d9e28ecf098ca374a74
2011-10-20 21:43:31 -07:00
Marc Blank
0ff0e155c5 Fix findExistingAccount to treat underscore properly
Bug: 2318959
Change-Id: Ia39ed29084dc8111c61ff552fa65519789b7c23a
2011-10-20 18:41:26 -07:00
Eric Fischer
805aca21ec Import revised translations. DO NOT MERGE
Change-Id: Icc57021105a6b95efc34f268e4bf778a75d2de1c
2011-10-20 17:59:44 -07:00
Ben Komalo
2f105a0543 Request focus in field when cc/bcc is toggled.
Bug: 3090788
Change-Id: I184dfe586199af9bcb016f60bf97bcd4382b4f73
2011-10-20 17:26:16 -07:00
Ben Komalo
41495761db Delete stale test.
This test has been disabled for over a year. I call it unnecessary and a
burdern at this point.

Bug: 2938323
Change-Id: I98bd67a0ed3bb1b880a5e7b6bcf8c90b8cf2de46
2011-10-20 16:50:38 -07:00
Ben Komalo
705e1244fb Merge "Fix account creation issues." 2011-10-20 16:49:58 -07:00
Ben Komalo
c5c44eed77 Fix account creation issues.
This is a theoretically dangerous issue that has surfaced only as a
monkey bug so far. The issue is that callers that create an Intent set
some global state, expecting that state to still be valid when the
Intent is handled. However, if the process was killed before the Intent
could be handled, or if that global singleton was not saved properly,
that state was lost and SetupData was never initialized properly.

Bug: 5337276
Change-Id: I6bd08a0dec13f54c7ba8d536ebdc87e6c559c483
2011-10-20 14:08:20 -07:00
Eric Fischer
d6d3a4929d am 46b6a648: (-s ours) Import revised translations. DO NOT MERGE
* commit '46b6a648bf66453b5a86c7dfeaaaa2bd1e0ed7f1':
  Import revised translations.  DO NOT MERGE
2011-10-20 11:34:35 -07:00
Eric Fischer
46b6a648bf Import revised translations. DO NOT MERGE
Change-Id: Ie7cd1694802394129d0b8666209a6718f0f01877
2011-10-20 11:10:35 -07:00
The Android Automerger
19a4f793fd merge in ics-release history after reset to master 2011-10-20 07:01:26 -07:00
Ben Komalo
2ca9441e8c Update Intent passed to contacts.
Reduce the number of intent keys so that a more compact dialog can be
used.
Bug: 5483848

Change-Id: I4d3da4a2a1480996bb14c5f2698a6530508ba7e7
2011-10-19 12:39:38 -07:00
Marc Blank
a91f33b44b onMove in CachedCursor shouldn't call the underlying cursor's method
Bug: 5472277
Change-Id: Ida5a840d2d27941bb8b548a4d2d985b1082e93b6
2011-10-19 12:33:52 -07:00
The Android Automerger
6f7ea9ce89 merge in ics-release history after reset to master 2011-10-19 07:44:59 -07:00
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
The Android Automerger
33208aea92 merge in ics-release history after reset to master 2011-10-18 07:00:39 -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