221517 Commits

Author SHA1 Message Date
Chong Zhang
d153c4f6f0 Fix flicker when releasing drag of divider
bug: 25564523
Change-Id: I9c19f40f27cc80b8e6e0e98a0d6455941bd624e7
2015-11-09 10:34:14 -08:00
Geoff Mendal
b226c1538b Merge "Import translations. DO NOT MERGE" into cw-e-dev am: f3b3a2ce2b -s ours am: 919b74ae35 -s ours
am: bd4d7ed031  -s ours

* commit 'bd4d7ed0312a828c032b87c31a6bc98316f5f756':
  Import translations. DO NOT MERGE
2015-11-09 18:07:56 +00:00
Geoff Mendal
bd4d7ed031 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: f3b3a2ce2b -s ours
am: 919b74ae35  -s ours

* commit '919b74ae355102deb2e6c35e95803edf29cea1d6':
  Import translations. DO NOT MERGE
2015-11-09 18:02:10 +00:00
Julia Reynolds
d7ba82d154 Merge "Bring back notification lights and sanitized color." 2015-11-09 18:01:59 +00:00
Geoff Mendal
919b74ae35 Merge "Import translations. DO NOT MERGE" into cw-e-dev
am: f3b3a2ce2b  -s ours

* commit 'f3b3a2ce2bc9b3f5eb6c96b7a828d245c84cc203':
  Import translations. DO NOT MERGE
2015-11-09 17:57:11 +00:00
Geoff Mendal
f3b3a2ce2b Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-11-09 17:51:40 +00:00
Geoff Mendal
8944b6926f Import translations. DO NOT MERGE am: 49eeda33dd -s ours am: 0414438abe -s ours am: 9ab5fb52a0 -s ours
am: fc2d271539  -s ours

* commit 'fc2d271539004509051f072be1f89b3fe5d8605f':
  Import translations. DO NOT MERGE
2015-11-09 17:45:37 +00:00
Geoff Mendal
016d9e7c4d Import translations. DO NOT MERGE
Change-Id: I58434476f0ed8edce61cd6827f25842d2f546340
Auto-generated-cl: translation import
2015-11-09 18:43:57 +01:00
Tao Bai
082593ba10 Merge "Using addAssetPathAsSharedLibrary to load asset." 2015-11-09 17:40:55 +00:00
Geoff Mendal
fc2d271539 Import translations. DO NOT MERGE am: 49eeda33dd -s ours am: 0414438abe -s ours
am: 9ab5fb52a0  -s ours

* commit '9ab5fb52a0d2d03b86a3862363f0594356a90bcd':
  Import translations. DO NOT MERGE
2015-11-09 17:39:01 +00:00
Geoff Mendal
9ab5fb52a0 Import translations. DO NOT MERGE am: 49eeda33dd -s ours
am: 0414438abe  -s ours

* commit '0414438abe0718f5007d7b580981d6ba204b655c':
  Import translations. DO NOT MERGE
2015-11-09 17:34:42 +00:00
Julia Reynolds
10ee1fcf79 Bring back notification lights and sanitized color.
buildUnstyled() was doing more than I noticed in
I81f8ffed0eb76084b2f2b25b97e325858f0a1d05.

Change-Id: I2109fc0d5bae692676b0ca72ff5048f0a3037375
2015-11-09 12:33:42 -05:00
Geoff Mendal
0414438abe Import translations. DO NOT MERGE
am: 49eeda33dd  -s ours

* commit '49eeda33ddca15ff8b8e820d1cf68a99cde9806a':
  Import translations. DO NOT MERGE
2015-11-09 17:27:25 +00:00
Filip Gruszczynski
0116852120 Merge "Always add PhoneWindow when creating DecorView." 2015-11-09 17:25:00 +00:00
Geoff Mendal
a9a6d4aef9 Merge "Import translations. DO NOT MERGE" 2015-11-09 17:23:22 +00:00
Roozbeh Pournader
6da1693c0c Merge "Removed unused setLocale() method." 2015-11-09 17:22:37 +00:00
Geoff Mendal
49eeda33dd Import translations. DO NOT MERGE
Change-Id: I664d6f94b74430f003182bc72db6610521883fa9
Auto-generated-cl: translation import
2015-11-09 18:10:12 +01:00
Geoff Mendal
718655cfe5 Import translations. DO NOT MERGE
Change-Id: I3eaea2f4c4de7b66b77f75a29457a1b187c776da
Auto-generated-cl: translation import
2015-11-09 17:51:22 +01:00
Filip Gruszczynski
bc8d90d484 Always add PhoneWindow when creating DecorView.
Because DecorView is now a static inner class, we need to remember to
always add the PhoneWindow on which it depends.
PhoneWindow.generateDecor will do that now to prevent further
mistakes.

Also remove PhoneWindow.setFeatureFromAttrs which is not used
anywhere and seems to be an artifact from the past.

Bug: 25086413
Change-Id: I0d8e5df717d7046e85ffc58f7ec4e94ce15a7d80
2015-11-09 08:47:48 -08:00
Filip Gruszczynski
86d6f7cd1a Merge "Ignore wallpaper when looking for a position for a free window." 2015-11-09 16:13:48 +00:00
Geoff Mendal
42817202e2 Merge "Import translations. DO NOT MERGE" 2015-11-09 14:02:52 +00:00
Geoff Mendal
37f269f4a5 Merge "Import translations. DO NOT MERGE" 2015-11-09 14:00:25 +00:00
Geoff Mendal
530db1eb98 Import translations. DO NOT MERGE
Change-Id: Ie70cf29b4a04891f28aa117c96b2dce917cebceb
Auto-generated-cl: translation import
2015-11-09 05:58:55 -08:00
Geoff Mendal
ac7a784db9 Merge "Import translations. DO NOT MERGE" 2015-11-09 13:57:07 +00:00
Geoff Mendal
aab2feaac4 Import translations. DO NOT MERGE
Change-Id: I4e19184520f6d4b3c9145fa13e16488cb3fe1c23
Auto-generated-cl: translation import
2015-11-09 05:56:05 -08:00
Geoff Mendal
ac61db5ebc Import translations. DO NOT MERGE
Change-Id: I75bc3c96b606f19818b4da31b15db9be6ba05760
Auto-generated-cl: translation import
2015-11-09 05:52:07 -08:00
Nicolas Prévot
d59262667c Merge "Add method to tell the dpc if provisioning is allowed." 2015-11-09 13:49:31 +00:00
Geoff Mendal
0c08418336 Merge "Import translations. DO NOT MERGE" 2015-11-09 13:48:47 +00:00
Geoff Mendal
4246fd66ec Import translations. DO NOT MERGE am: 210f0afaf9 -s ours am: a1d0738253 -s ours
am: 16c692f57f  -s ours

* commit '16c692f57f17102b1980144fb259875d40139d10':
  Import translations. DO NOT MERGE
2015-11-09 13:44:21 +00:00
Geoff Mendal
6b0486a6b5 Import translations. DO NOT MERGE
Change-Id: Idace066b891d2ef54c18e1421368bcc5c6fd0fa1
Auto-generated-cl: translation import
2015-11-09 05:39:52 -08:00
Geoff Mendal
16c692f57f Import translations. DO NOT MERGE am: 210f0afaf9 -s ours
am: a1d0738253  -s ours

* commit 'a1d07382539525a44baf0ca581e04fb445639831':
  Import translations. DO NOT MERGE
2015-11-09 13:37:24 +00:00
Geoff Mendal
a1d0738253 Import translations. DO NOT MERGE
am: 210f0afaf9  -s ours

* commit '210f0afaf9011d044d261f1044a1a7368cb89e7e':
  Import translations. DO NOT MERGE
2015-11-09 13:29:12 +00:00
Geoff Mendal
feba19c70e Import translations. DO NOT MERGE
Change-Id: I5f41d236c6356c6412ef943e51701aa5d08e8890
Auto-generated-cl: translation import
2015-11-09 05:14:26 -08:00
Geoff Mendal
210f0afaf9 Import translations. DO NOT MERGE
Change-Id: I45eaf276af6efa775e2e7c0a7cd8040fbf13e32e
Auto-generated-cl: translation import
2015-11-09 05:11:08 -08:00
Jeff Sharkey
5d7e951686 Merge "More APIs for encryption-aware apps." 2015-11-08 21:32:56 +00:00
Jeff Sharkey
e17ac15697 More APIs for encryption-aware apps.
Apps can mark manifest components as being encryption-aware, which
means they can safely be run before the credential encrypted storage
is available.

Start adding filtering logic so that we only return these components
when a user is running "with amnesia."  That is to say, only device
encrypted storage is available, so the user is running but with only
partial knowledge of its data.

To avoid calling into ActivityManager with the PackageManager lock
held, we quickly determine user state and splice the state into the
flags for later per-component evaluation.

Bug: 22358539
Change-Id: Idc56ec29f1ef04da8963e004314d7f5e47400997
2015-11-08 13:29:16 -08:00
Filip Gruszczynski
5e69fda6d9 Ignore wallpaper when looking for a position for a free window.
Wallpaper wanders through the window list, for example to position
itself directly behind keyguard. Because of this it will break the
ordering based on WindowState.mBaseLayer. There might windows with
higher mBaseLayer behind it and we don't want the new window to
appear above them. An example of this is adding of the docked stack
divider. Consider a scenario with the following ordering (top to
bottom): keyguard, wallpaper, assist preview, apps. We want the dock
divider to land below the assist preview, so the dock divider must
ignore the wallpaper, with which it shares the base layer.

Bug: 25564817
Change-Id: I5bab792d972f845931b54db9f9ae5ff9a4a0e9b3
2015-11-08 12:58:34 -08:00
Chad Brubaker
da3dc74f49 Merge "Support nested domain-config elements" am: 749501e88e am: b549899d0b
am: 8427d98f7c

* commit '8427d98f7c3d6c1c05d78c5a9202c4110c3732b5':
  Support nested domain-config elements
2015-11-07 22:28:24 +00:00
Chad Brubaker
0420d8de74 Merge "Add xml source for network security configuration" am: ead46ecc84 am: 0cb8f01410
am: 06d93173b1

* commit '06d93173b1fe98013a41f3a35993dea8e60e48ad':
  Add xml source for network security configuration
2015-11-07 22:27:01 +00:00
Chad Brubaker
8427d98f7c Merge "Support nested domain-config elements" am: 749501e88e
am: b549899d0b

* commit 'b549899d0b6b95032a9c75e64c9276acd85510d1':
  Support nested domain-config elements
2015-11-07 22:23:00 +00:00
Chad Brubaker
06d93173b1 Merge "Add xml source for network security configuration" am: ead46ecc84
am: 0cb8f01410

* commit '0cb8f014105b9e8e3bdb12cf091ef61e8c575333':
  Add xml source for network security configuration
2015-11-07 22:21:40 +00:00
Chad Brubaker
b549899d0b Merge "Support nested domain-config elements"
am: 749501e88e

* commit '749501e88e5fa6bdc6594a9db5c232e31bdda867':
  Support nested domain-config elements
2015-11-07 22:16:10 +00:00
Chad Brubaker
0cb8f01410 Merge "Add xml source for network security configuration"
am: ead46ecc84

* commit 'ead46ecc843e3686ff5ae8008f4452fc79f847e7':
  Add xml source for network security configuration
2015-11-07 22:14:36 +00:00
Chad Brubaker
749501e88e Merge "Support nested domain-config elements" 2015-11-07 22:11:04 +00:00
Adam Lesinski
400136e06a Merge "AAPT2: Accept aliases defined for external resource types" 2015-11-07 22:11:00 +00:00
Chad Brubaker
ead46ecc84 Merge "Add xml source for network security configuration" 2015-11-07 22:10:50 +00:00
Adam Lesinski
caf4a89f18 Merge "AAPT2: Disambiguate merging of resources" 2015-11-07 22:09:37 +00:00
Adam Lesinski
fa10505cea AAPT2: Accept aliases defined for external resource types
Resource types that are typically stored outside of the resource table
(like layout, xml, drawable) can only have aliases (reference to another
resource).

Change-Id: Idb768801f02bb142e5be5e438904f221499bd756
2015-11-07 13:34:39 -08:00
Chad Brubaker
bd173c28fc Support nested domain-config elements
Nested domain-config inherit unset parameters from the domain-config
they are nested in. This helps avoid copy and pasted configs that are
almost the same except a few minor differences for a domain with
slightly different requirements.

For example: Consider a domain-config for example.com that, among other
settings, does not enforce hsts. Now if you want the rules for
example.com to apply to secure.example.com except that hsts _is_
enforced you can make a nested domain-config for secure.example.com
under example.com that sets hstsEnforced="true" and nothing else.

Change-Id: I9e33f7e62127fd7f4f15c3560fff2f2626477bd4
2015-11-07 13:31:04 -08:00
Adam Lesinski
83f2255f69 AAPT2: Disambiguate merging of resources
Merging local app resources is slightly different than merging
resources from a static library.

Local app resources may not have a package name set, but we do take interest in the
ID set for the package (should be 0x0 or match the ID of the app we're building).

Static library resources have an explicit package name defined for them, so we
only merge resources from that package.

Change-Id: I95e559ae94cc1df6972e77a347b1b37a93674c4d
2015-11-07 11:51:23 -08:00