Adrian Roos
4d26aa4bfe
Merge "WM: Perform layout based on the requested flags" into pi-dev
...
am: 10755b8a1c
2018-05-18 07:38:13 -07:00
Evan Laird
c747de7428
Merge "Don't always set the clock to View.GONE" into pi-dev
...
am: b3f8cd7dbe
2018-05-18 07:28:46 -07:00
Adrian Roos
10755b8a1c
Merge "WM: Perform layout based on the requested flags" into pi-dev
2018-05-18 14:22:11 +00:00
TreeHugger Robot
b3f8cd7dbe
Merge "Don't always set the clock to View.GONE" into pi-dev
2018-05-18 14:21:48 +00:00
Adrian Roos
ce877ef63b
Merge "PIP: Fix transition to and from PiP when letterboxed" into pi-dev
...
am: e839902298
2018-05-18 07:18:32 -07:00
TreeHugger Robot
e839902298
Merge "PIP: Fix transition to and from PiP when letterboxed" into pi-dev
2018-05-18 14:06:18 +00:00
Adrian Roos
d63b3c4673
Merge "WM: Prevent unminimizing docked stack on AOD" into pi-dev
...
am: 1f6e5dce9f
2018-05-18 06:38:08 -07:00
TreeHugger Robot
1f6e5dce9f
Merge "WM: Prevent unminimizing docked stack on AOD" into pi-dev
2018-05-18 13:30:29 +00:00
Nicolas Geoffray
53ce75e46d
Merge "More light grey APIs." into pi-dev
...
am: 5c22485903
2018-05-18 06:26:49 -07:00
Nicolas Geoffray
ea07979645
Merge "Add one new API to light grey." into pi-dev
...
am: 7b47a51323
2018-05-18 06:22:51 -07:00
Nicolas Geoffray
5c22485903
Merge "More light grey APIs." into pi-dev
2018-05-18 13:10:43 +00:00
Nicolas Geoffray
7b47a51323
Merge "Add one new API to light grey." into pi-dev
2018-05-18 13:10:10 +00:00
Adrian Roos
604ef951ce
PIP: Fix transition to and from PiP when letterboxed
...
When an app is letterboxed, it cannot always take up the full
task bounds, and we need to constrain the PIP animations to
the constraints imposed by the layout.
Change-Id: If238ddfb4462c7e1e5c975f76666ad1d4ec3b076
Fixes: 77802617
Test: Enable cutout emulation, enter landscape, verify transitions both into and out of pip work as intended.
Test: atest ActivityManagerPinnedStackTests
2018-05-18 12:38:07 +00:00
Adrian Roos
b56b3c3c85
WM: Prevent unminimizing docked stack on AOD
...
When we go to AOD, we hide Home's app token - which causes
the docked stack to unminimize. There was some protection against
that because the same thing happens on the keyguard, but that did
not work because the keyguard state is not aware of AOD. Instead,
we pipe the source of truth from AM down to WM and use this instead.
Change-Id: I68d1079a6bbd9080816ee52c1b5650623a661421
Fixes: 79267409
Test: Enter split screen, go to home, turn of screen, turn on screen. Verify docked stack stays minimized and there is no janky transition
2018-05-18 12:19:33 +00:00
Jorim Jaggi
9ac7de096d
Merge changes I608d4b61,Ia7900e75 into pi-dev
...
am: e4a8d4c7e9
2018-05-18 05:01:44 -07:00
Jorim Jaggi
e4a8d4c7e9
Merge changes I608d4b61,Ia7900e75 into pi-dev
...
* changes:
Follow up to Ia7900e753b29187a7a7b81f393666687e8b8e04b
Apply surface parameters in sync with RenderThread
2018-05-18 11:49:56 +00:00
Adrian Roos
4bb17ec37b
WM: Perform layout based on the requested flags
...
When the global system ui visibility changes,
this clears certain sysui flags from windows. However,
if we then use this value to perform layout, we might
lay out the window in a way the app did not expect and
that is not stable during transitions in and out of
full screen.
To fix this, always use the sysUiFl that the app provided
in its window attributes, instead of using the window state's
changing state.
Change-Id: I5f9b3ed37be84553e9e2d912a102675beb6fc11a
Fixes: 76084813
Test: Open Video in browser, enter full screen, play, press home. Verify transition into PiP is smooth.
2018-05-18 13:38:05 +02:00
Jorim Jaggi
2d39fb90d0
Follow up to Ia7900e753b29187a7a7b81f393666687e8b8e04b
...
Test: Open notification
Bug: 78611607
Change-Id: I608d4b619d5e236c1c874c8c7613f35574d45fd4
Merged-In: I608d4b619d5e236c1c874c8c7613f35574d45fd4
2018-05-18 09:47:12 +00:00
Erik Kline
413d00c1c0
Merge "Add explicit override for default Private DNS mode" into pi-dev
...
am: 2b3c858296
2018-05-18 01:08:26 -07:00
TreeHugger Robot
2b3c858296
Merge "Add explicit override for default Private DNS mode" into pi-dev
2018-05-18 07:59:58 +00:00
TreeHugger Robot
d3c97f9ab4
Merge "resolve merge conflicts of f121c090c2 to pi-dev-plus-aosp" into pi-dev-plus-aosp
2018-05-18 07:55:21 +00:00
Kristian Monsen
99837d59ea
Merge "Remove most sounds" into pi-dev
...
am: f67a491e44
2018-05-18 00:54:42 -07:00
Kristian Monsen
f67a491e44
Merge "Remove most sounds" into pi-dev
2018-05-18 07:44:55 +00:00
Remi NGUYEN VAN
f6509edebb
resolve merge conflicts of f121c090c2 to pi-dev-plus-aosp
...
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ie9aab5e1d786f32d219a66dd7184a9209c684eeb
2018-05-18 14:24:09 +09:00
Remi NGUYEN VAN
f121c090c2
Merge changes Ieb0a5d24,I44df6668
...
am: 646dfc7703
2018-05-17 20:40:35 -07:00
nharold
0e2b79a2fc
[automerger skipped] Merge "Add toString() method to PhysicalChannelConfig" am: 71c11daaf5
...
am: 20d1bc0f1e
2018-05-17 20:40:10 -07:00
Bill Yi
6793fac034
Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev am: abf0ff542a am: 4d58eb3bc1 am: e388855c62
...
am: 188e6e3470
2018-05-17 20:26:07 -07:00
Bill Yi
e408200ec2
[automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927 skipped: 43bd9fa8b2 am: f028e75015 -s ours am: c22431c753 -s ours am: 4ec0ca5336 -s ours
...
am: b566338b2d
2018-05-17 20:19:41 -07:00
Bill Yi
d838378919
Merge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into oc-dev am: c844ea5c96 am: 44042a74c7 am: 5ed1b8864a
...
am: 32e6e4174b
2018-05-17 20:13:50 -07:00
Bill Yi
2cc8a319eb
[automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0 skipped: ead9437423 am: f3df46779d -s ours am: 2fe6455d18 -s ours am: 1531155e0d -s ours
...
am: c8edeae913
2018-05-17 20:07:45 -07:00
Bill Yi
3d337786e1
Merge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into oc-dev am: a86ba9b6e5 am: 7c05674594 am: 08f437f2b4
...
am: fe4a877ae7
2018-05-17 20:03:46 -07:00
Bill Yi
d02a6897cf
[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96 skipped: 913239f688 am: 1c6bdf5174 -s ours am: a1df530ac7 -s ours am: 407d517cb8 -s ours
...
am: 35fdd1e3d1
2018-05-17 19:57:29 -07:00
Bill Yi
3f8654fc5d
Merge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev am: 70060539aa am: aaddf187e4 am: 1803fec75f
...
am: d620aa5fd0
2018-05-17 19:55:18 -07:00
Bill Yi
532835e9c2
[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2 skipped: a492d4d55b am: 6959e2b475 -s ours am: eef34578b3 -s ours am: ede8c555e0 -s ours
...
am: 3befcfc215
2018-05-17 19:48:55 -07:00
Bill Yi
a005a51e35
Merge changes from topic "am-d2edaf8079284e4cb27fcc47cdd92f40" into pi-dev
...
am: 8e9cab7943
2018-05-17 19:43:56 -07:00
nharold
20d1bc0f1e
Merge "Add toString() method to PhysicalChannelConfig"
...
am: 71c11daaf5
2018-05-17 19:32:16 -07:00
Bill Yi
a80ecc3d36
[automerger skipped] Import translations. DO NOT MERGE skipped: 439fdb13fc skipped: a98b588532 am: 1221af165e -s ours am: aa961b929b -s ours am: 1190c6d633 -s ours
...
am: c2a90162af
2018-05-17 19:26:20 -07:00
Bill Yi
188e6e3470
Merge changes from topic "am-99e79364-ab71-4d96-8a34-000c07c66d3e" into oc-dev am: abf0ff542a am: 4d58eb3bc1
...
am: e388855c62
2018-05-17 19:15:22 -07:00
Bill Yi
b566338b2d
[automerger skipped] Import translations. DO NOT MERGE skipped: c2a85c8927 skipped: 43bd9fa8b2 am: f028e75015 -s ours am: c22431c753 -s ours
...
am: 4ec0ca5336
2018-05-17 19:10:00 -07:00
Bill Yi
32e6e4174b
Merge changes from topic "am-e925dddc-33b5-48cc-bddb-e978735e99b7" into oc-dev am: c844ea5c96 am: 44042a74c7
...
am: 5ed1b8864a
2018-05-17 18:56:46 -07:00
Lucas Dupin
2bd8b6e4f2
Merge "Do not allow bouncer translation when scrimmed" into pi-dev
...
am: 0a72c6b08d
2018-05-17 18:53:18 -07:00
Bill Yi
c8edeae913
[automerger skipped] Import translations. DO NOT MERGE skipped: 2f53cb7cc0 skipped: ead9437423 am: f3df46779d -s ours am: 2fe6455d18 -s ours
...
am: 1531155e0d
2018-05-17 18:49:54 -07:00
Remi NGUYEN VAN
646dfc7703
Merge changes Ieb0a5d24,I44df6668
...
* changes:
Fix SntpClientTest failures with no active network
Allow specifying a network for SNTP time sync
2018-05-18 01:44:44 +00:00
Lucas Dupin
a54d7db28f
Merge "Fix issue where guts would require bouncer" into pi-dev
...
am: a42d8f6e89
2018-05-17 18:44:15 -07:00
Bill Yi
fe4a877ae7
Merge changes from topic "am-3142fca9-100b-4dd4-8848-117761166ffe" into oc-dev am: a86ba9b6e5 am: 7c05674594
...
am: 08f437f2b4
2018-05-17 18:43:23 -07:00
Calin Juravle
5e38cbb831
Merge "Allow adb to pull profile snapshots" into pi-dev
...
am: b7aea6d3e2
2018-05-17 18:39:56 -07:00
Bill Yi
35fdd1e3d1
[automerger skipped] Import translations. DO NOT MERGE skipped: 7b2e87bd96 skipped: 913239f688 am: 1c6bdf5174 -s ours am: a1df530ac7 -s ours
...
am: 407d517cb8
2018-05-17 18:37:26 -07:00
Bill Yi
d620aa5fd0
Merge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev am: 70060539aa am: aaddf187e4
...
am: 1803fec75f
2018-05-17 18:32:19 -07:00
Bill Yi
740543d1b5
Merge changes from topic "am-646cf556-d36a-48f1-a414-3797586a8a96" into oc-dev am: ea5a5f49cc am: 5897727afc am: 8993fe413b
...
am: 140b527cb8
2018-05-17 18:28:54 -07:00
Bill Yi
3befcfc215
[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2 skipped: a492d4d55b am: 6959e2b475 -s ours am: eef34578b3 -s ours
...
am: ede8c555e0
2018-05-17 18:25:29 -07:00
