OSDN Git Service
Chong Zhang [Tue, 10 Nov 2015 22:05:40 +0000 (14:05 -0800)]
Fix crash on invalid dimlayer
If the app is already removed, don't apply any more dim on the window
that's pending removal. It causes invalid DimState to be added back
to the controller, and we crash as these don't have valid dimlayers.
bug:
25570092
Change-Id: I7e3c56c6eb636fdcb01d9bba90f77b3885e216fb
Geoff Mendal [Mon, 9 Nov 2015 18:07:56 +0000 (18:07 +0000)]
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
Geoff Mendal [Mon, 9 Nov 2015 18:02:10 +0000 (18:02 +0000)]
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
Julia Reynolds [Mon, 9 Nov 2015 18:01:59 +0000 (18:01 +0000)]
Merge "Bring back notification lights and sanitized color."
Geoff Mendal [Mon, 9 Nov 2015 17:57:11 +0000 (17:57 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
am:
f3b3a2ce2b -s ours
* commit '
f3b3a2ce2bc9b3f5eb6c96b7a828d245c84cc203':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Nov 2015 17:51:40 +0000 (17:51 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-e-dev
Geoff Mendal [Mon, 9 Nov 2015 17:45:37 +0000 (17:45 +0000)]
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
Geoff Mendal [Mon, 9 Nov 2015 17:43:57 +0000 (18:43 +0100)]
Import translations. DO NOT MERGE
Change-Id: I58434476f0ed8edce61cd6827f25842d2f546340
Auto-generated-cl: translation import
Tao Bai [Mon, 9 Nov 2015 17:40:55 +0000 (17:40 +0000)]
Merge "Using addAssetPathAsSharedLibrary to load asset."
Geoff Mendal [Mon, 9 Nov 2015 17:39:01 +0000 (17:39 +0000)]
Import translations. DO NOT MERGE am:
49eeda33dd -s ours am:
0414438abe -s ours
am:
9ab5fb52a0 -s ours
* commit '
9ab5fb52a0d2d03b86a3862363f0594356a90bcd':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Nov 2015 17:34:42 +0000 (17:34 +0000)]
Import translations. DO NOT MERGE am:
49eeda33dd -s ours
am:
0414438abe -s ours
* commit '
0414438abe0718f5007d7b580981d6ba204b655c':
Import translations. DO NOT MERGE
Julia Reynolds [Mon, 9 Nov 2015 16:04:55 +0000 (11:04 -0500)]
Bring back notification lights and sanitized color.
buildUnstyled() was doing more than I noticed in
I81f8ffed0eb76084b2f2b25b97e325858f0a1d05.
Change-Id: I2109fc0d5bae692676b0ca72ff5048f0a3037375
Geoff Mendal [Mon, 9 Nov 2015 17:27:25 +0000 (17:27 +0000)]
Import translations. DO NOT MERGE
am:
49eeda33dd -s ours
* commit '
49eeda33ddca15ff8b8e820d1cf68a99cde9806a':
Import translations. DO NOT MERGE
Filip Gruszczynski [Mon, 9 Nov 2015 17:25:00 +0000 (17:25 +0000)]
Merge "Always add PhoneWindow when creating DecorView."
Geoff Mendal [Mon, 9 Nov 2015 17:23:22 +0000 (17:23 +0000)]
Merge "Import translations. DO NOT MERGE"
Roozbeh Pournader [Mon, 9 Nov 2015 17:22:37 +0000 (17:22 +0000)]
Merge "Removed unused setLocale() method."
Geoff Mendal [Mon, 9 Nov 2015 17:10:12 +0000 (18:10 +0100)]
Import translations. DO NOT MERGE
Change-Id: I664d6f94b74430f003182bc72db6610521883fa9
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Nov 2015 16:51:22 +0000 (17:51 +0100)]
Import translations. DO NOT MERGE
Change-Id: I3eaea2f4c4de7b66b77f75a29457a1b187c776da
Auto-generated-cl: translation import
Filip Gruszczynski [Sun, 8 Nov 2015 21:40:19 +0000 (13:40 -0800)]
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
Filip Gruszczynski [Mon, 9 Nov 2015 16:13:48 +0000 (16:13 +0000)]
Merge "Ignore wallpaper when looking for a position for a free window."
Geoff Mendal [Mon, 9 Nov 2015 14:02:52 +0000 (14:02 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 9 Nov 2015 14:00:25 +0000 (14:00 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 9 Nov 2015 13:58:55 +0000 (05:58 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ie70cf29b4a04891f28aa117c96b2dce917cebceb
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Nov 2015 13:57:07 +0000 (13:57 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 9 Nov 2015 13:56:05 +0000 (05:56 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4e19184520f6d4b3c9145fa13e16488cb3fe1c23
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Nov 2015 13:52:07 +0000 (05:52 -0800)]
Import translations. DO NOT MERGE
Change-Id: I75bc3c96b606f19818b4da31b15db9be6ba05760
Auto-generated-cl: translation import
Nicolas Prévot [Mon, 9 Nov 2015 13:49:31 +0000 (13:49 +0000)]
Merge "Add method to tell the dpc if provisioning is allowed."
Geoff Mendal [Mon, 9 Nov 2015 13:48:47 +0000 (13:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 9 Nov 2015 13:44:21 +0000 (13:44 +0000)]
Import translations. DO NOT MERGE am:
210f0afaf9 -s ours am:
a1d0738253 -s ours
am:
16c692f57f -s ours
* commit '
16c692f57f17102b1980144fb259875d40139d10':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Nov 2015 13:39:52 +0000 (05:39 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idace066b891d2ef54c18e1421368bcc5c6fd0fa1
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Nov 2015 13:37:24 +0000 (13:37 +0000)]
Import translations. DO NOT MERGE am:
210f0afaf9 -s ours
am:
a1d0738253 -s ours
* commit '
a1d07382539525a44baf0ca581e04fb445639831':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Nov 2015 13:29:12 +0000 (13:29 +0000)]
Import translations. DO NOT MERGE
am:
210f0afaf9 -s ours
* commit '
210f0afaf9011d044d261f1044a1a7368cb89e7e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 9 Nov 2015 13:14:26 +0000 (05:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5f41d236c6356c6412ef943e51701aa5d08e8890
Auto-generated-cl: translation import
Geoff Mendal [Mon, 9 Nov 2015 13:11:08 +0000 (05:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: I45eaf276af6efa775e2e7c0a7cd8040fbf13e32e
Auto-generated-cl: translation import
Jeff Sharkey [Sun, 8 Nov 2015 21:32:56 +0000 (21:32 +0000)]
Merge "More APIs for encryption-aware apps."
Jeff Sharkey [Sat, 7 Nov 2015 06:40:29 +0000 (22:40 -0800)]
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
Filip Gruszczynski [Sun, 8 Nov 2015 20:58:34 +0000 (12:58 -0800)]
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
Chad Brubaker [Sat, 7 Nov 2015 22:28:24 +0000 (22:28 +0000)]
Merge "Support nested domain-config elements" am:
749501e88e am:
b549899d0b
am:
8427d98f7c
* commit '
8427d98f7c3d6c1c05d78c5a9202c4110c3732b5':
Support nested domain-config elements
Chad Brubaker [Sat, 7 Nov 2015 22:27:01 +0000 (22:27 +0000)]
Merge "Add xml source for network security configuration" am:
ead46ecc84 am:
0cb8f01410
am:
06d93173b1
* commit '
06d93173b1fe98013a41f3a35993dea8e60e48ad':
Add xml source for network security configuration
Chad Brubaker [Sat, 7 Nov 2015 22:23:00 +0000 (22:23 +0000)]
Merge "Support nested domain-config elements" am:
749501e88e
am:
b549899d0b
* commit '
b549899d0b6b95032a9c75e64c9276acd85510d1':
Support nested domain-config elements
Chad Brubaker [Sat, 7 Nov 2015 22:21:40 +0000 (22:21 +0000)]
Merge "Add xml source for network security configuration" am:
ead46ecc84
am:
0cb8f01410
* commit '
0cb8f014105b9e8e3bdb12cf091ef61e8c575333':
Add xml source for network security configuration
Chad Brubaker [Sat, 7 Nov 2015 22:16:10 +0000 (22:16 +0000)]
Merge "Support nested domain-config elements"
am:
749501e88e
* commit '
749501e88e5fa6bdc6594a9db5c232e31bdda867':
Support nested domain-config elements
Chad Brubaker [Sat, 7 Nov 2015 22:14:36 +0000 (22:14 +0000)]
Merge "Add xml source for network security configuration"
am:
ead46ecc84
* commit '
ead46ecc843e3686ff5ae8008f4452fc79f847e7':
Add xml source for network security configuration
Chad Brubaker [Sat, 7 Nov 2015 22:11:04 +0000 (22:11 +0000)]
Merge "Support nested domain-config elements"
Adam Lesinski [Sat, 7 Nov 2015 22:11:00 +0000 (22:11 +0000)]
Merge "AAPT2: Accept aliases defined for external resource types"
Chad Brubaker [Sat, 7 Nov 2015 22:10:50 +0000 (22:10 +0000)]
Merge "Add xml source for network security configuration"
Adam Lesinski [Sat, 7 Nov 2015 22:09:37 +0000 (22:09 +0000)]
Merge "AAPT2: Disambiguate merging of resources"
Adam Lesinski [Sat, 7 Nov 2015 21:34:39 +0000 (13:34 -0800)]
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
Chad Brubaker [Sat, 7 Nov 2015 07:02:37 +0000 (23:02 -0800)]
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
Adam Lesinski [Sat, 7 Nov 2015 19:51:23 +0000 (11:51 -0800)]
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
Roozbeh Pournader [Sat, 7 Nov 2015 19:22:24 +0000 (11:22 -0800)]
Removed unused setLocale() method.
The setLocale() method in android.content.res.AssetManager was not
used. Removing it to reduce maintenance cost.
Change-Id: I1b168fe84c2465d1ebc2b62bb965eda885e1220a
Adam Lesinski [Sat, 7 Nov 2015 18:07:01 +0000 (18:07 +0000)]
Merge "AAPT2: Add support for clearer in-progress public attributes"
Chad Brubaker [Thu, 5 Nov 2015 07:55:29 +0000 (23:55 -0800)]
Add xml source for network security configuration
XmlConfigSource parses an ApplicationConfig from an xml resource.
Currently this supports app-wide default configuration via the
base-config element, per domain via the domain-config element and
inheritance of unset properties at parse time.
Inheritance of unset properties is currently only:
domain-config -> base-config -> platform default configuration
Where the most specific value is used.
For example: If the base-config specifies trust anchors, all connections
will use those anchors except for connections to a domain which has a
domain-config that specifies trust anchors, in which case the
domain-config's trust anchors will be used. If the domain-config or
base-config don't set trust anchors, or don't exist, then the platform
default trust anchors will be used.
Nested domain-config entries, debug-overrides, and thorough
documentation of the xml format will follow in later commits.
Change-Id: I1232ff1e8079a81b340bc12e142f0889f6947aa0
Chad Brubaker [Sat, 7 Nov 2015 02:53:50 +0000 (02:53 +0000)]
Merge "Fix incorrect hstsEnforced lookup" am:
1347cb81f4 am:
90b9ed5c82
am:
d28d4bcf9b
* commit '
d28d4bcf9b6c9d8142fbed995250d41a59387c72':
Fix incorrect hstsEnforced lookup
Chad Brubaker [Sat, 7 Nov 2015 02:47:59 +0000 (02:47 +0000)]
Merge "Fix incorrect hstsEnforced lookup" am:
1347cb81f4
am:
90b9ed5c82
* commit '
90b9ed5c82f5a3bd754bebe69a8883b65d3f95cc':
Fix incorrect hstsEnforced lookup
Chad Brubaker [Sat, 7 Nov 2015 02:42:05 +0000 (02:42 +0000)]
Merge "Fix incorrect hstsEnforced lookup"
am:
1347cb81f4
* commit '
1347cb81f402c628f3346ea350a5862749901d59':
Fix incorrect hstsEnforced lookup
Chad Brubaker [Sat, 7 Nov 2015 02:37:45 +0000 (02:37 +0000)]
Merge "Fix incorrect hstsEnforced lookup"
Jeff Sharkey [Sat, 7 Nov 2015 02:37:21 +0000 (02:37 +0000)]
Merge "Initial file-based encryption public APIs."
Jeff Sharkey [Fri, 6 Nov 2015 00:18:51 +0000 (16:18 -0800)]
Initial file-based encryption public APIs.
Define two explicit directories where device-encrypted and
credential-encrypted data will be stored. Third-party apps only
need access to the device-encrypted directory, so that's the only
API exposed for now.
General cleanup in how ApplicationInfo details are derived.
Bug:
22358539
Change-Id: If0a0108721a4aa1c3052b4912e08604bbf24e1ae
Adam Lesinski [Sat, 7 Nov 2015 02:31:20 +0000 (02:31 +0000)]
Merge "AAPT2: Fix inclusion of comments in R.java javadoc"
Adam Lesinski [Sat, 7 Nov 2015 02:25:04 +0000 (18:25 -0800)]
AAPT2: Add support for clearer in-progress public attributes
Before, the ID assigned to a public resource without an explicitly set id
was more difficult to figure out. It would be the next available ID.
AAPT2 introduces a new way to specify public attributes in progress.
<public-group type="attr" first-id="0x0101047f">
<public name="foo" />
<public name="bar" />
...
</public-group>
The IDs assigned to each resource is auto-incremented starting from `first-id`.
This also keeps resource's with the same type grouped together so that
the auto-incrementing nature is evident.
Also, due to how AAPT2 was implemented, this is required :P
Change-Id: I95ea92ad0405e87ed0b1766879bb2f1d9d0b636e
Chad Brubaker [Sat, 7 Nov 2015 02:08:12 +0000 (18:08 -0800)]
Fix incorrect hstsEnforced lookup
Change-Id: I00364d8c1d3311bebd3ad88e557860e694ba5018
Makoto Onuki [Sat, 7 Nov 2015 01:21:13 +0000 (01:21 +0000)]
Merge "Make sure to persist user restrictions in UMS"
Jim Miller [Wed, 30 Sep 2015 01:55:32 +0000 (18:55 -0700)]
Log fingerprint state in KeyguardUpdateMonitor.
Attempt to track down bug
24508587
Change-Id: Ifb998e2752ec515c36dd302c2abeb1ab27f3a2f3
Suprabh Shukla [Sat, 7 Nov 2015 00:44:18 +0000 (00:44 +0000)]
Merge "Fixing recent tasks not getting restored at startup"
Adam Lesinski [Fri, 6 Nov 2015 23:14:35 +0000 (15:14 -0800)]
AAPT2: Fix inclusion of comments in R.java javadoc
Comments weren't being copied when merged from the various
resource tables.
Also refactored the JavaClassGenerator to omit a class
if no entries exist for it.
Change-Id: I6eaa89b7b3715bc05403635a2baf0d1db3efd142
Suprabh Shukla [Fri, 6 Nov 2015 23:39:42 +0000 (15:39 -0800)]
Fixing recent tasks not getting restored at startup
Check for empty list before reading activity at index 0.
Change-Id: If87e3c4d2cedd86fdb427ddfb27d1f32f8f93412
Tao Bai [Fri, 6 Nov 2015 23:49:40 +0000 (23:49 +0000)]
Merge "Add test to cover loading shared-lib with appAsLib as true. This patch made AppAsLib_test use its own resource"
Winson [Fri, 6 Nov 2015 23:30:29 +0000 (15:30 -0800)]
Fixing issue with canceling the thumbnail in addition to the app window.
Bug:
25392381
Change-Id: Ib507f53bcd2aad4771c2546f5e8bfe771769e9a2
Winson [Fri, 6 Nov 2015 22:54:41 +0000 (14:54 -0800)]
Reverting debug flag.
Change-Id: I918d43827ecd7be52b41fb632850775161aa3902
Tao Bai [Thu, 5 Nov 2015 07:58:32 +0000 (23:58 -0800)]
Using addAssetPathAsSharedLibrary to load asset.
This will alllow framework to overrdie the resource id even the
package resource is app.
Change-Id: I176166e7c51ceb5e84101deb3f467a826f484251
Winson [Fri, 6 Nov 2015 21:11:16 +0000 (13:11 -0800)]
Adding fast alt-tab trigger to prevent full animation.
Change-Id: I3df7a99977d0c2687eea084a95a0953429e8ff47
Tao Bai [Fri, 6 Nov 2015 22:00:17 +0000 (14:00 -0800)]
Add test to cover loading shared-lib with appAsLib as true.
This patch made AppAsLib_test use its own resource
Bug
22487604
Change-Id: Iac4cc949f1b25c326a287a49e0b031bf6831e9e9
Makoto Onuki [Fri, 6 Nov 2015 22:24:24 +0000 (14:24 -0800)]
Make sure to persist user restrictions in UMS
Bug
25565111
Change-Id: Ic48ce728a1c2b55d70276a37b9a359407167edf1
Winson [Fri, 6 Nov 2015 17:16:26 +0000 (09:16 -0800)]
Fixing up some more focus edge cases.
- Disallow touch while alt-tabbing
- Allow keyboard to focus tab while scrolling
- Cleaning up some old classes that aren’t really being used
Change-Id: Ibabea093afb711b07f398677d25735421b7c7e53
Chad Brubaker [Fri, 6 Nov 2015 21:28:24 +0000 (21:28 +0000)]
Merge "Fix directory check in UserCertificateSource" am:
1483ee3aa5 am:
2d7d8401a9
am:
a8fd356640
* commit '
a8fd35664070134f0596238ad0c5bdaa3adc221b':
Fix directory check in UserCertificateSource
Chad Brubaker [Fri, 6 Nov 2015 21:26:55 +0000 (21:26 +0000)]
Merge "Fix incorrect hasPerDomainConfigs check" am:
c5c51dafb3 am:
dd6d0918c4
am:
a21b4a528d
* commit '
a21b4a528dc7c728b3546899c90758d583f35495':
Fix incorrect hasPerDomainConfigs check
Chad Brubaker [Fri, 6 Nov 2015 21:25:31 +0000 (21:25 +0000)]
Merge "Use a builder for NetworkSecurityConfig" am:
7e98f2e697 am:
478fad3cf5
am:
54b4b8fdfc
* commit '
54b4b8fdfc336b8a4902637e622c3ede879edcde':
Use a builder for NetworkSecurityConfig
Chad Brubaker [Fri, 6 Nov 2015 21:19:02 +0000 (21:19 +0000)]
Merge "Fix directory check in UserCertificateSource" am:
1483ee3aa5
am:
2d7d8401a9
* commit '
2d7d8401a9c1e03f8f141415b25cfb415df73695':
Fix directory check in UserCertificateSource
Alan Viverette [Fri, 6 Nov 2015 21:17:36 +0000 (21:17 +0000)]
Merge "Mutate DrawableContainer children immediately after inflation"
Chad Brubaker [Fri, 6 Nov 2015 21:17:34 +0000 (21:17 +0000)]
Merge "Fix incorrect hasPerDomainConfigs check" am:
c5c51dafb3
am:
dd6d0918c4
* commit '
dd6d0918c42aec3fb08d6df15822078e35cc4f33':
Fix incorrect hasPerDomainConfigs check
Chad Brubaker [Fri, 6 Nov 2015 21:10:54 +0000 (21:10 +0000)]
Merge "Fix directory check in UserCertificateSource"
am:
1483ee3aa5
* commit '
1483ee3aa5737f9aff06021b5ec9fe3086ee2e66':
Fix directory check in UserCertificateSource
Chad Brubaker [Fri, 6 Nov 2015 21:09:11 +0000 (21:09 +0000)]
Merge "Fix incorrect hasPerDomainConfigs check"
am:
c5c51dafb3
* commit '
c5c51dafb3ede95622eb350dae0b662abb611925':
Fix incorrect hasPerDomainConfigs check
Jorim Jaggi [Fri, 6 Nov 2015 21:00:18 +0000 (22:00 +0100)]
Update divider shadow when it is moving
Change-Id: Ifc67ba3ee640929248cad6479d9c0df818e32f40
Chad Brubaker [Fri, 6 Nov 2015 21:02:23 +0000 (21:02 +0000)]
Merge "Fix directory check in UserCertificateSource"
Chad Brubaker [Fri, 6 Nov 2015 21:02:01 +0000 (21:02 +0000)]
Merge "Fix incorrect hasPerDomainConfigs check"
Chad Brubaker [Fri, 6 Nov 2015 20:52:12 +0000 (12:52 -0800)]
Fix directory check in UserCertificateSource
If the user has not added any CAs to the user trust store the user-added
directory will not have been created.
Change-Id: I8b5f73af3c0761c56969874231004fedbf7badda
Chad Brubaker [Fri, 6 Nov 2015 20:50:31 +0000 (12:50 -0800)]
Fix incorrect hasPerDomainConfigs check
Change-Id: Iaeedbbcc5f12475d346a77dba84b38a1d3d8d346
Jorim Jaggi [Fri, 6 Nov 2015 20:31:17 +0000 (21:31 +0100)]
Fix build
Change-Id: Ie716bbec49920af459ceddf8e51387ccf5946a7f
Chad Brubaker [Fri, 6 Nov 2015 20:31:02 +0000 (20:31 +0000)]
Merge "Use a builder for NetworkSecurityConfig" am:
7e98f2e697
am:
478fad3cf5
* commit '
478fad3cf53874f9cc96169cd25b29b9c031637a':
Use a builder for NetworkSecurityConfig
Chad Brubaker [Fri, 6 Nov 2015 20:25:33 +0000 (20:25 +0000)]
Merge "Use a builder for NetworkSecurityConfig"
am:
7e98f2e697
* commit '
7e98f2e6976fb38c5c3a7421547d1756ba5faafe':
Use a builder for NetworkSecurityConfig
Jorim Jaggi [Fri, 6 Nov 2015 19:54:50 +0000 (20:54 +0100)]
Don't kill process when dismissing stack
Also clear the binder identity to incorrect permission
checks, which lead to crashes when dismissing the docked
stack.
Change-Id: I53175769745e8bbdbc296806b9297eb3c53d4452
Alan Viverette [Fri, 6 Nov 2015 20:22:43 +0000 (15:22 -0500)]
Mutate DrawableContainer children immediately after inflation
Previously we would only mutate children when they were displayed, so
applyTheme() calls would be applied to the shared constant state. Now
we mutate() immediately after obtaining the child, which ensures we
have a clean constant state. This also allows us to remove extra
mutate() calls, since we know all child drawables are already mutated.
Bug:
25081461
Change-Id: I52390db268690a8e181f5b9bbe612b7ed6ce9359
Chad Brubaker [Fri, 6 Nov 2015 20:21:29 +0000 (20:21 +0000)]
Merge "Use a builder for NetworkSecurityConfig"
Filip Gruszczynski [Fri, 6 Nov 2015 19:49:01 +0000 (19:49 +0000)]
Merge "Fix windows disappearing when resizing freeform or docked."
Filip Gruszczynski [Fri, 6 Nov 2015 17:21:17 +0000 (09:21 -0800)]
Fix windows disappearing when resizing freeform or docked.
Also includes some code clarity improvements: mHasSurface is set using a
setter, some fields get private.
Change-Id: I2f834880493c008fdccf07ff6ebfebd2e26690a9
Alan Viverette [Fri, 6 Nov 2015 19:41:59 +0000 (19:41 +0000)]
Merge "Correctly handle child drawables with no intrinsic size"
Jorim Jaggi [Fri, 6 Nov 2015 19:28:42 +0000 (19:28 +0000)]
Merge changes I619be025,I126765a3,I0307c191,I9425785f,I623bd48d, ...
* changes:
Restore changes lost during merge
Fix flicker at the end of docked stack divider animation
Implement divider UX interactions
Immediately start resizing when touching docked divider
Fix black holes and flickering in docked resizing
Migrate docked divider drawing to SysUI
Supply app transition specs with a future
Jorim Jaggi [Fri, 6 Nov 2015 16:32:44 +0000 (17:32 +0100)]
Restore changes lost during merge
Change-Id: I619be025988470e27b614ed0ad009e5d785f19eb
Alan Viverette [Fri, 6 Nov 2015 19:09:31 +0000 (19:09 +0000)]
Merge "Use ConstantState directly instead of ConstantStateFuture"