Derek Sollenberger
fe1c990a57
Merge "Bind correct FBO when drawing a WebView into a layer." into pi-dev
...
am: 6a1df0d541
2018-05-31 20:51:45 -07:00
Winson Chung
5ccabc2c66
Merge "Update the task stack state when resizing the tasks after the PiP animation" into pi-dev
...
am: 83bf0877b8
2018-05-31 20:43:09 -07:00
Hall Liu
7236332a74
Merge "Move the "repeated calls" caveat" into pi-dev
...
am: 7897fa3b9a
2018-05-31 20:33:01 -07:00
Winson Chung
29218b8fc7
Merge "Fix regression in virtual key haptics" into pi-dev
...
am: c197176cd2
2018-05-31 20:23:26 -07:00
Colin Cross
a0a864e571
[automerger skipped] Merge "Add support for --replace-version to aapt2" am: 186be90eb6
...
am: 5c0601d65a
2018-05-31 20:19:27 -07:00
Android Build Merger (Role)
273d167d62
Merge "Merge "Fix MbmsDownloadSession documentation" am: bb2ce1010e am: 76f1bd4979" into pi-dev-plus-aosp
2018-06-01 03:14:52 +00:00
Hall Liu
d439992a16
Merge "Fix MbmsDownloadSession documentation" am: bb2ce1010e
...
am: 76f1bd4979
2018-05-31 20:14:22 -07:00
Winson Chung
b11ca32c54
Merge "Skip task overlay in calcuating task description" into pi-dev
...
am: d17d5a487d
2018-05-31 20:11:17 -07:00
Eeshan Shrimali
2ea7cf2299
Merge "DCB whitelist shortcode for user association" am: b17d1962b7
...
am: 53f46128a0
2018-05-31 20:07:12 -07:00
Derek Sollenberger
6a1df0d541
Merge "Bind correct FBO when drawing a WebView into a layer." into pi-dev
2018-06-01 02:51:51 +00:00
Winson Chung
83bf0877b8
Merge "Update the task stack state when resizing the tasks after the PiP animation" into pi-dev
2018-06-01 01:35:27 +00:00
Hall Liu
7897fa3b9a
Merge "Move the "repeated calls" caveat" into pi-dev
2018-06-01 01:14:37 +00:00
Derek Sollenberger
0fba15b2ba
Bind correct FBO when drawing a WebView into a layer.
...
The WebView was unable to draw into either a standard clipped
layer or the "fading edges" unclipped layer. This CL and its
companion test cases ensure that both work with simple and
complex clips.
Bug: 79619253
Bug: 80443556
Bug: 80477645
Test: atest CtsUiRenderingTestCases:.LayerTests
Merged-In: I0e16b724f74415a61cc2a841ccf4a491f293ac94
Change-Id: I4900222975fc841b11828916878fb0ea6d87dcda
2018-06-01 01:08:15 +00:00
Winson Chung
c197176cd2
Merge "Fix regression in virtual key haptics" into pi-dev
2018-06-01 00:40:46 +00:00
Colin Cross
5c0601d65a
Merge "Add support for --replace-version to aapt2"
...
am: 186be90eb6
2018-05-31 17:38:48 -07:00
Hall Liu
76f1bd4979
Merge "Fix MbmsDownloadSession documentation"
...
am: bb2ce1010e
2018-05-31 17:33:55 -07:00
Eeshan Shrimali
53f46128a0
Merge "DCB whitelist shortcode for user association"
...
am: b17d1962b7
2018-05-31 17:23:12 -07:00
TreeHugger Robot
d17d5a487d
Merge "Skip task overlay in calcuating task description" into pi-dev
2018-06-01 00:08:58 +00:00
Hall Liu
bc9f7cdf91
Move the "repeated calls" caveat
...
Previous CL put the "repeated calls will replace the listener" comment
on the wrong method. Fixing.
Bug: 80493663
Test: None, doc change
Change-Id: I2736a582d79b3b2f204519c649d82d9ba912e1e5
2018-05-31 16:26:01 -07:00
Winson Chung
15036ca521
Update the task stack state when resizing the tasks after the PiP animation
...
- When the animation into PiP ends, we clear the task stack state and
request a layout prior to resizing the the stack to update the task
bounds to the stack bounds. This triggers a relayout from the client,
which fetches the new configuration prior to handling the PiP mode/config
change scheduled as a part of the PiP mode change.
We can instead update the task stack state when we resize the tasks to
ensure that we don't relayout multiple times.
Bug: 75995355
Test: atest CtsActivityManagerDeviceTestCases:ActivityManagerPinnedStackTests
Change-Id: I58a6e30651f16b85ec160e977554b8d091b461ec
2018-05-31 16:06:43 -07:00
Colin Cross
186be90eb6
Merge "Add support for --replace-version to aapt2"
2018-05-31 22:53:37 +00:00
Colin Cross
0433fc4e98
Merge "Add support for --replace-version to aapt2" into pi-dev-plus-aosp
2018-05-31 22:53:13 +00:00
Andrii Kulian
0ad1df7817
Merge "Don't pause non-top activities when making visible" into pi-dev
...
am: a798833075
2018-05-31 15:52:00 -07:00
Andrii Kulian
a798833075
Merge "Don't pause non-top activities when making visible" into pi-dev
2018-05-31 22:35:10 +00:00
Yin-Chia Yeh
e384ef8768
Merge "Camera: add new detailed error callback" into pi-dev
...
am: d4c5d1e448
2018-05-31 15:12:00 -07:00
Shuzhen Wang
7696265ef6
Merge "Camera: Document getNumberOfCameras behavior for logical camera" into pi-dev
...
am: fe8c263011
2018-05-31 15:04:52 -07:00
Todd Kennedy
87fbe89e5d
Merge "Ensure permission held for MATCH_KNOWN_PACKAGES" into pi-dev
...
am: 2f898c4df5
2018-05-31 14:56:10 -07:00
Hall Liu
b7e5cd58ac
Merge "Fix MbmsDownloadSession documentation" into pi-dev
...
am: 73942715f3
2018-05-31 14:51:26 -07:00
Jason Monk
b9e5da09b5
Merge "Don't use stable providers for slices" into pi-dev
...
am: de8e3c227c
2018-05-31 14:46:38 -07:00
Mady Mellor
6f4f0da87e
Merge "Add a primary action to slices from keyguard slice provider" into pi-dev
...
am: 1031bf5f76
2018-05-31 14:41:33 -07:00
Paul Lawrence
3dc6c2b6cd
Merge "Don't cause infinite loop if windows manager crashes in safe mode" into pi-dev
...
am: 89e1217c8f
2018-05-31 14:21:39 -07:00
Hall Liu
bb2ce1010e
Merge "Fix MbmsDownloadSession documentation"
2018-05-31 21:16:05 +00:00
TreeHugger Robot
d4c5d1e448
Merge "Camera: add new detailed error callback" into pi-dev
2018-05-31 21:11:24 +00:00
Brad Ebinger
f122c22c50
Merge "IMS: Support for Implicit Call Rejection" am: 19d032b695
...
am: 982ceb81a9
2018-05-31 14:02:10 -07:00
TreeHugger Robot
fe8c263011
Merge "Camera: Document getNumberOfCameras behavior for logical camera" into pi-dev
2018-05-31 20:50:33 +00:00
TreeHugger Robot
2f898c4df5
Merge "Ensure permission held for MATCH_KNOWN_PACKAGES" into pi-dev
2018-05-31 20:41:01 +00:00
Hall Liu
73942715f3
Merge "Fix MbmsDownloadSession documentation" into pi-dev
2018-05-31 20:34:42 +00:00
TreeHugger Robot
de8e3c227c
Merge "Don't use stable providers for slices" into pi-dev
2018-05-31 20:21:16 +00:00
Yin-Chia Yeh
a07cd32684
Camera: add new detailed error callback
...
For the legacy shim layer to tell the difference between evction
and disable error.
Test: CTS CameraEvictionTest + IdleUidTest
Bug: 77486868
Change-Id: I5b68f55460287634903c9b8b42188d9dec8744d5
2018-05-31 12:24:55 -07:00
Shuzhen Wang
e7d3cd0a76
Camera: Document getNumberOfCameras behavior for logical camera
...
For camera1 API, framework only exposes one camera id for every
logical/physical camera id group. Document this behavior accordingly.
Test: Build
Bug: 80075565
Change-Id: I32c2de84d27a603d485014255bf1fad5031aa08e
2018-05-31 12:21:37 -07:00
Calin Juravle
97208b949b
Merge "Update the boot image profile and preloaded classes" into pi-dev
...
am: a78334f80c
2018-05-31 12:16:38 -07:00
Jason Monk
f65e34a95b
Merge "Protect broadcasts we use to talk to settings" into pi-dev
...
am: 3dbd752246
2018-05-31 12:11:28 -07:00
Brad Ebinger
982ceb81a9
Merge "IMS: Support for Implicit Call Rejection"
...
am: 19d032b695
2018-05-31 12:10:05 -07:00
Treehugger Robot
b17d1962b7
Merge "DCB whitelist shortcode for user association"
2018-05-31 19:01:32 +00:00
Mady Mellor
1031bf5f76
Merge "Add a primary action to slices from keyguard slice provider" into pi-dev
2018-05-31 18:50:26 +00:00
TreeHugger Robot
89e1217c8f
Merge "Don't cause infinite loop if windows manager crashes in safe mode" into pi-dev
2018-05-31 18:49:38 +00:00
Hall Liu
7cdacd3c30
Fix MbmsDownloadSession documentation
...
Fix the TODO from forever ago and update the docs for the listener
registration methods.
Change-Id: I1276d0afe430e1b50c0af1fdfacb12a89ea5aa38
Fixes: 80493663
Test: None, comments only
2018-05-31 11:40:11 -07:00
Android Build Merger (Role)
358c593f33
Merge "Merge "Fix comments to reflect changes in eth service" into pi-dev am: 44f7147084" into pi-dev-plus-aosp
2018-05-31 18:34:00 +00:00
Pavel Maltsev
d400338c6b
Merge "Fix comments to reflect changes in eth service" into pi-dev
...
am: 44f7147084
2018-05-31 11:33:20 -07:00
Android Build Merger (Role)
8ea57c6592
Merge "Merge "Updates to shared lib for Launcher" into pi-dev am: f4833c4fb2" into pi-dev-plus-aosp
2018-05-31 18:27:13 +00:00
