Commit Graph

14458 Commits

Author SHA1 Message Date
Jorim Jaggi
96980318aa Merge "Re-apply local client state when leash changes" into rvc-dev am: 9c50a64e91 am: 125072dce1 am: d0d74de729 am: 6185375b3c am: ac4d50d4ee
Change-Id: Ic2a18372df71fb7e102e30c3da07baec3b81de89
2020-04-08 11:52:34 +00:00
Jorim Jaggi
ee54070608 Re-apply local client state when leash changes
When leash changes, we need to re-apply our local state, to ensure
new leash has same state as before and new leash is visible on
screen.

Test: Switch IME while open
Test: SurfaceControlTest
Fixes: 152876819
Change-Id: Ieae1aecdc3ddc427ccb89c4aa7ef7ae9283f39eb
2020-04-07 23:04:44 +00:00
Alex Spradlin
ef1c8f719f Merge "Add frame rate flexibility token" into rvc-dev am: 2845ad86a4 am: 928df10731 am: ddd44f0156
Change-Id: Ic81df70e38cc486ff883e1eb5bb6df6ecb15e677
2020-04-07 19:17:09 +00:00
Steven Thomas
2845ad86a4 Merge "Add frame rate flexibility token" into rvc-dev 2020-04-07 18:20:36 +00:00
TreeHugger Robot
2bf66482c8 Merge "Expose Display.getType() via TestApi." into rvc-dev am: bd745f763a am: 8122a3938e am: e1e4f30329 am: f845a21c07
Change-Id: Ia512ab896e77449bfbdc1a7e6fd54b4f573468a3
2020-04-07 17:40:24 +00:00
Automerger Merge Worker
37894bc45c Merge "Merge "Update controls after addToDisplay/relayout before dispatching insets" into rvc-dev am: 77d7bcc124 am: 2873becff7" into rvc-d1-dev-plus-aosp am: a5d9ff7eb6 am: 1198e2a2ec
Change-Id: I818ab389cd50935be5398904706c54e5df41739f
2020-04-07 16:55:07 +00:00
TreeHugger Robot
bd745f763a Merge "Expose Display.getType() via TestApi." into rvc-dev 2020-04-07 16:41:47 +00:00
TreeHugger Robot
77d7bcc124 Merge "Update controls after addToDisplay/relayout before dispatching insets" into rvc-dev 2020-04-07 16:26:53 +00:00
Santos Cordon
29d5b8f43e Expose Display.getType() via TestApi.
Bug: 151124371
Test: atest android.display.cts.DisplayTest
Change-Id: Id3c25fe675c1fa2b0070cf95736c608315b5e26b
2020-04-07 09:56:16 +00:00
Tiger Huang
0426a33650 Update controls after addToDisplay/relayout before dispatching insets
A window might request to control insets before it is added to WM and
expect the first dispatched WindowInsets as requested.

The first insets state returned from addToDisplay or relayout might be
not expected if the window just become thecontrol target in the
function.

With this CL, WM can return controls from addToDisplay and relayout, so
that the client can apply controls immediately, and update controlled
insets sources before dispatching the insets to the view hierarchy. This
enaures the insets dispatched are up-to-date.

Fix: 150756571
Test: atest WindowInsetsControllerTests RelayoutPerfTest
            WindowAddRemovePerfTest
Change-Id: Ib78c24beb7af5a54ad78935c3ddb260ef9645212
2020-04-07 16:05:40 +08:00
Automerger Merge Worker
0ea0caa75c Merge "Merge "Make the system action API more clear with documentation" into rvc-dev am: 3987ae1ad8 am: 66f5db1e8e" into rvc-d1-dev-plus-aosp am: 9b9021593e am: 7ff11732a8
Change-Id: I0248361a05abde1f23587d1e600db6f3ff491d49
2020-04-07 01:01:15 +00:00
Sally Yuen
3987ae1ad8 Merge "Make the system action API more clear with documentation" into rvc-dev 2020-04-06 23:54:03 +00:00
TreeHugger Robot
cec1922afc Merge "SurfaceView: Use BLAST transaction when visibility changes." into rvc-dev am: 7a851ba728 am: a50b55f770 am: 1b98e2320d am: 73758a1965
Change-Id: I7e044d42b77fd6294fe0c0484f2c73409d67fb0c
2020-04-06 21:43:09 +00:00
Rob Carr
199b626581 Merge "SurfaceView: Ensure we don't fill unused BLAST Transaction." into rvc-dev am: 0e22967d6c am: a989a1b0b8 am: 0d53701289 am: ca3f0917db
Change-Id: I882c2e8527d10665c875c9f272ccc20477b10075
2020-04-06 21:14:42 +00:00
TreeHugger Robot
7a851ba728 Merge "SurfaceView: Use BLAST transaction when visibility changes." into rvc-dev 2020-04-06 20:31:47 +00:00
Rob Carr
0e22967d6c Merge "SurfaceView: Ensure we don't fill unused BLAST Transaction." into rvc-dev 2020-04-06 20:02:13 +00:00
Jorim Jaggi
387991e2aa Merge "Revert "Revert "Defer updating InsetsSource.mFrame while animating""" into rvc-dev am: a775f45d85 am: 911ce402a4 am: 67658867a1 am: 46756d0fa2
Change-Id: Ida5cd0ca35bed637a2bc3e5cacc20168efa1d990
2020-04-06 15:48:46 +00:00
Jorim Jaggi
a775f45d85 Merge "Revert "Revert "Defer updating InsetsSource.mFrame while animating""" into rvc-dev 2020-04-06 14:27:16 +00:00
Jorim Jaggi
33a2183d4b Revert "Revert "Defer updating InsetsSource.mFrame while animating""
This reverts commit 8c56ac6b94.

Underlying issue has been fixed:

Test: InsetsControllerTest
Bug: 152071027
Change-Id: I2b80de7067bf688a6b36233b9a1e92e2cf31c148
2020-04-06 14:28:59 +02:00
Tony Huang
3b3d8ea61d Merge "Fix split divider janky" into rvc-dev am: a171ec4203 am: e6abf0b719 am: c030cdafad am: d1db0d4023
Change-Id: Ie2fedd5893590745c62d85819693f71a38c46f27
2020-04-06 08:52:20 +00:00
Tony Huang
a171ec4203 Merge "Fix split divider janky" into rvc-dev 2020-04-06 07:24:15 +00:00
Steven Thomas
6ec6fbc2cc Add frame rate flexibility token
Add support for temporarily relaxing frame rate restrictions in surface
flinger. This is used by CTS tests to get a consistent device state
while running frame rate tests.

Bug: 148033900

Test: - On a Pixel 4, I turned the brightness down and covered the
ambient light sensor, causing the display manager to set a frame rate
restriction. I ran the frame rate CTS test without these CLs applied,
and confirmed the test failed because surface flinger couldn't switch
frame rates, as expected. Then I ran the tests with the CLs applied, and
confirmed the tests pass.

- I confirmed that, without adopting shell permission identity, the CTS
test is denied the request to acquire a frame rate flexibility token. So
normal apps won't be able to access this.

Change-Id: Ie2b611cf5726c14a7a22e315a85bf6200d190682
2020-04-04 19:55:00 -07:00
Rob Carr
9d02abec80 Merge "BLASTBufferQueue: Fix unnecessary copying of Surface" into rvc-dev am: 73e4cc48c7 am: 1827f745ae am: 95cdc5fc5c am: ade8075965
Change-Id: I17cab3aeffaec66bf7264e5aaa7d94c6dfc971d4
2020-04-03 22:58:14 +00:00
Robert Carr
92e08bf997 SurfaceView: Ensure we don't fill unused BLAST Transaction.
If BLAST is enabled and we somehow end up in positionLost or
setParentSpaceRectangle without having called setUseBLASTSyncTransaction
we will end up putting operations in to a Transaction which will never be
applied. This condition should be considered a bug, but it's best to
defend against it. To compensate, rather than checking the global
use BLAST flag, we check if the current draw is actually using
BLAST.

Bug: 152663327
Bug: 152780239
Test: Existing tests pass
Change-Id: I3c05b83400b59be82a339933fc8ef1382d4f0e21
2020-04-03 15:07:35 -07:00
Rob Carr
73e4cc48c7 Merge "BLASTBufferQueue: Fix unnecessary copying of Surface" into rvc-dev 2020-04-03 21:48:08 +00:00
TreeHugger Robot
53700f16e7 Merge "Revert "Fix DecorView error about non-visual context"" into rvc-dev am: 59a65bdc0f am: fca4a6e057 am: 3dc933b9b1 am: 518d408967
Change-Id: I4f320ff2ce2df427d4c032639f97d7db1150be55
2020-04-03 20:42:04 +00:00
Rob Carr
c2dc32f00c Merge "BLASTBufferQueue: Avoid unnecessary transactions" into rvc-dev am: 0bed41a993 am: 5192d2be9b am: e8ea7c64cf am: d4fda59476
Change-Id: I20b5d3554de88cc7991d8851d58284587f54f0a7
2020-04-03 20:22:53 +00:00
TreeHugger Robot
59a65bdc0f Merge "Revert "Fix DecorView error about non-visual context"" into rvc-dev 2020-04-03 19:53:56 +00:00
Rob Carr
0bed41a993 Merge "BLASTBufferQueue: Avoid unnecessary transactions" into rvc-dev 2020-04-03 19:04:42 +00:00
Vadim Tryshev
5420fffe19 Revert "Fix DecorView error about non-visual context"
This reverts commit 828c498904.

Reason for revert: b/152806048
Bug: 152806048

Change-Id: I0ba53944a7fddf42cccf79c6495945c8afa3ab31
2020-04-03 18:06:05 +00:00
Robert Carr
59773cbdd4 SurfaceView: Use BLAST transaction when visibility changes.
If visibility changes we will try and hide the Surfaces from
the RT. We want to sync this with ViewRoot drawing so
we enable BLAST sync for the next frame in this case.

Bug: 152663327
Bug: 152780239
Test: Existing tests pass
Change-Id: I9cd157954a3ce87a8f95a7be97d6d5c7f324327b
2020-04-03 17:12:58 +00:00
TreeHugger Robot
846ab2095b Merge "Only track focused next served view in onViewFocusChanged" into rvc-dev am: 37b8baa3a8 am: 00dde964ce am: 8adeade86f am: 75b7024ba2
Change-Id: Ice0e1e1d1529cd980178204ac5278a64dc41e33b
2020-04-03 16:57:04 +00:00
sallyyuen
ca5c921416 Make the system action API more clear with documentation
Bug: 149755168
Test: N/A
Change-Id: I2c82ce755d3c94d0514f49da0cc770c83dafbad1
2020-04-03 09:23:29 -07:00
TreeHugger Robot
37b8baa3a8 Merge "Only track focused next served view in onViewFocusChanged" into rvc-dev 2020-04-03 15:51:28 +00:00
Robert Carr
1dd148d9ac BLASTBufferQueue: Fix unnecessary copying of Surface
When we call mSurface.transferFrom(getOrCreateBLASTSurface()) we
always end up incrementing mSurface.generationId, because
BLASTBufferQueue.java::getSurface will always return a new native
wrapper object. We had a similar situation with
mSurface.copyFrom(mSurfaceControl), and had to build IGBP
comparison in to the native method. Here though, it's easier
to just rely on the stability of the Surface (never changes
for the lifetime of the BLASTBufferQueueAdapter) to avoid
duplicate calls to transferFrom.

Bug: 152501005
Test: Existing tests pass.
Change-Id: I64b9a6ae3cabfa75974e040460638417bfac6845
2020-04-02 15:29:34 -07:00
Adrian Roos
56e213bb9d Merge "WindowInsetsAnimation: Fix app driven closing of IME" into rvc-dev am: 56f4b1b9d3 am: 2b8d80b8cb am: c5bd862378 am: cd8f9672ae
Change-Id: Ic90c4d54265240fd9e95d54dfe81c1c1d110f703
2020-04-02 19:31:06 +00:00
Adrian Roos
b2544c811c Merge "WindowInsetsAnimation: Synchronously dispatch window insets animation callbacks" into rvc-dev am: f5a0f80fe2 am: bbec0bba6d am: 685b92c8fc am: 621318aacb
Change-Id: I1f2966143a915b3c7725eca02680be20c915d55b
2020-04-02 19:30:55 +00:00
Robert Carr
cb250de686 BLASTBufferQueue: Avoid unnecessary transactions
Currently every call to getOrCreateBLASTSurface produces a transaction.
This transaction has two parts, both of which can be eliminated:
	1. The first is the reparent. This was written when the
	client allocated the BLAST SurfaceControl, but now the WM
	allocates it and it has the correct parent to start, so
	we can just eliminate this.
	2. Showing the surface. We can eliminate this by just showing
	the surface by default.

Bug: 152501055
Test: Flip BLAST flag. Play.
Change-Id: If6e28e9153a09909fb3bb061980deb82c132dd5a
2020-04-02 12:28:36 -07:00
Jorim Jaggi
0046722d6c Merge "WindowInsets: Ignore consumeStableInsets()" into rvc-dev am: d80aee2ed8 am: 104cd6c756 am: d386951afb am: 2686524ef7
Change-Id: Id5381eae7fdc36c4d261f0f9715293f67c847376
2020-04-02 19:25:38 +00:00
Automerger Merge Worker
bf8ab402e9 Merge "Merge "Request fit system windows if soft input mode updates" into rvc-dev am: ea4fe825b7 am: 16fb21c354" into rvc-d1-dev-plus-aosp am: 1e9b641945 am: 0e21be56c5
Change-Id: Ieef7ec4c46c427c3a9cd2a5acb8024c08cc260a1
2020-04-02 19:20:16 +00:00
Jorim Jaggi
2601b17b2b Merge "Initialize sourceless insets with Insets.NONE" into rvc-dev am: fe2228aa89 am: ce24761577 am: d4485fe330 am: b954419290
Change-Id: Ica3c28957e8fa51cba071cc29c48cac55a286e5d
2020-04-02 19:17:01 +00:00
Feng Cao
f8347366d2 Merge "Define custom equals method for bundles in the inline APIs" into rvc-dev am: 257aa916ac am: 8ab445a7a9 am: 3f185c6881 am: 6c8b4417cc
Change-Id: Iff11cae258441c0adbccc16bf28b2ccc2f61d252
2020-04-02 18:34:58 +00:00
Rob Carr
b0469c1ec8 Merge changes I98b51b43,I03cb69e1 into rvc-dev am: f2f056ef71 am: a77f60313d am: 698a536015 am: 3174ed17d3
Change-Id: Ia96143157d57b95c79405abe66924fb024fe2883
2020-04-02 17:38:07 +00:00
Automerger Merge Worker
17390b4a33 Merge "Merge changes Ia152bc41,Iae8026e7 into rvc-dev am: 71a6d0bf2b am: 9716d62b4d" into rvc-d1-dev-plus-aosp am: aa5088485c am: aef5228d68
Change-Id: I84c387f3c2f7c774c236a5786f5602dc997c3cbe
2020-04-02 17:06:10 +00:00
Adrian Roos
56f4b1b9d3 Merge "WindowInsetsAnimation: Fix app driven closing of IME" into rvc-dev 2020-04-02 13:41:46 +00:00
Adrian Roos
f5a0f80fe2 Merge "WindowInsetsAnimation: Synchronously dispatch window insets animation callbacks" into rvc-dev 2020-04-02 13:41:46 +00:00
Jorim Jaggi
d80aee2ed8 Merge "WindowInsets: Ignore consumeStableInsets()" into rvc-dev 2020-04-02 11:21:22 +00:00
Jorim Jaggi
ea4fe825b7 Merge "Request fit system windows if soft input mode updates" into rvc-dev 2020-04-02 10:56:27 +00:00
Jorim Jaggi
fe2228aa89 Merge "Initialize sourceless insets with Insets.NONE" into rvc-dev 2020-04-02 10:55:38 +00:00
Feng Cao
257aa916ac Merge "Define custom equals method for bundles in the inline APIs" into rvc-dev 2020-04-02 02:47:01 +00:00