Commit Graph

18876 Commits

Author SHA1 Message Date
Yohei Yukawa
15439351ac Merge "Revert "Don't send the same values to onUpdateSelection repeatedly"" 2022-06-21 14:50:06 +00:00
Yunfan Chen
50b66eeba6 Merge "Print layout extended by cutout private flag in toString()" into tm-qpr-dev am: d9fa425f92 am: 4e01e2f250
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18871019

Change-Id: Ia2a619da74428cd0b3582279c373e378a7d3c061
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 06:23:39 +00:00
Yunfan Chen
4e01e2f250 Merge "Print layout extended by cutout private flag in toString()" into tm-qpr-dev am: d9fa425f92
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18871019

Change-Id: Ia61c121ff1610e380b7501eb404bcef4a4478cab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 06:04:43 +00:00
Yunfan Chen
d9fa425f92 Merge "Print layout extended by cutout private flag in toString()" into tm-qpr-dev 2022-06-21 05:43:03 +00:00
Yohei Yukawa
2cc4677f2c Revert "Don't send the same values to onUpdateSelection repeatedly"
This reverts commit c743cb9477.

Reason for revert:
This workaround is no longer necessary [1][2].

 [1]: I56f3198e54f689adc9541f2c2644ee19bcc6deed
      e345e90a01
 [2]: Ic84fb070e0ff21dffb7e6c9bbdc6320eb5946fd9
      1046a22aae6d6c0ee21aca7446540a9d27902559

Fix: 183474466
Test: atest CtsInputMethodTestCases:InProcessImeTest
Test: atest CtsAccessibilityServiceTestCases:AccessibilityImeTest#testOnUpdateSelectionForInProcessA11yIme
Change-Id: Ie5d00bbc51b66f1d6b50969f03d1b3e3bca5e9da
2022-06-21 04:58:14 +00:00
Vadim Caen
c21bb6a1b1 Merge "Prevent callback registration when back flag is disabled" into tm-dev am: 1c6de844ce am: 0592820f44 am: 9e2a134dde
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18794217

Change-Id: Id3181b7f8155aa5e3bda8c1604fd70a0cd290601
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 22:35:13 +00:00
Vadim Caen
9e2a134dde Merge "Prevent callback registration when back flag is disabled" into tm-dev am: 1c6de844ce am: 0592820f44
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18794217

Change-Id: I367c3888b726f0f7c83d382881741478e715d549
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-20 21:19:32 +00:00
Vadim Caen
a2e45f1ed1 Prevent callback registration when back flag is disabled
When the enableOnBackInvokedCallback is set to false (or not set),
registering an OnBackInvokedCallback should be a no-op to avoid
overriding the default compat callback.

Test: Manual testing registering a callback on an app with the flag
disabled and doing a back gesture. Currently we don't have test
executing a back gesture so automated tests are not possible

Bug: 235206960

Change-Id: I54d843f11130a78ed5a68cbe4722e601a2086ee1
Merged-In: I54d843f11130a78ed5a68cbe4722e601a2086ee1
(cherry picked from commit aa48dc3c2d)
2022-06-20 11:40:18 +02:00
Vadim Caen
14c60531bd Merge "Prevent callback registration when back flag is disabled" 2022-06-19 13:39:58 +00:00
Vishnu Nair
6936919fcc Merge "Updated OWNERS file" am: 1f02cb71f6 am: 2fb7421c5e am: b8616e8bed am: 47d8c11d13 am: 18627bb02f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2128756

Change-Id: I1762719543d6db8e686459672eed562a7e6afd9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-18 00:38:11 +00:00
Vishnu Nair
18627bb02f Merge "Updated OWNERS file" am: 1f02cb71f6 am: 2fb7421c5e am: b8616e8bed am: 47d8c11d13
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2128756

Change-Id: I81f2ed7745fb0b4376fb232261aff3616a27b970
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-18 00:11:27 +00:00
Vishnu Nair
b8616e8bed Merge "Updated OWNERS file" am: 1f02cb71f6 am: 2fb7421c5e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2128756

Change-Id: I3712dc538e0a665b7641b53c82c798dce9b6bfe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 23:39:53 +00:00
Yohei Yukawa
44c672edea Merge "Make IAccessibilityInputMethodSession async even in in-proc cases" 2022-06-17 23:25:55 +00:00
Chavi Weingarten
3768beaf83 Updated OWNERS file
Test: N/A
Change-Id: I413016ac7d4a10c192009d30e3e0f74be986ffbb
2022-06-17 20:07:41 +00:00
Yohei Yukawa
f11999b7a0 Make IAccessibilityInputMethodSession async even in in-proc cases
This CL mirrors what I've done for IInputMethodSession [1] for A11y
IME, which relies on a corresponding Binder interface
IAccessibilityInputMethodSession.

When the A11y IME and IME client are running in different processes,
this CL literally changes nothing.

 [1]: I56f3198e54f689adc9541f2c2644ee19bcc6deed
      e345e90a01

Fix: 236311060
Test: atest CtsAccessibilityServiceTestCases:AccessibilityImeTest#testOnUpdateSelectionForInProcessA11yIme
Change-Id: Ic84fb070e0ff21dffb7e6c9bbdc6320eb5946fd9
2022-06-16 19:05:41 -07:00
Vadim Caen
18acc5316e Merge "Allow a null Rect to be passed as sourceCrop" 2022-06-16 20:10:55 +00:00
Yohei Yukawa
e38985b019 Merge "Make IInputMethodSession async even for in-proc cases" 2022-06-16 19:46:38 +00:00
Xin Li
195b02b570 Merge "Merge Android 12 QPR 3" 2022-06-16 18:51:54 +00:00
Yohei Yukawa
2f2fa38fd8 Merge "Rename InputMethodSessionWrapper to IInputMethodSessionInvoker" 2022-06-16 18:22:52 +00:00
Yohei Yukawa
e345e90a01 Make IInputMethodSession async even for in-proc cases
This CL applies the same approach I used for IInputMethodClient
recently [1], that is, to use a dedicated worker thread to invoke
binder IPCs to achieve the async semantics even if IInputMethodSession
is not a BinderProxy, which happens when both the IME and IME client
are running in the same process.

When the IME and IME client are running in different processes, this
CL literally changes nothing.

 [1]: I0a7dd5162c4b94599b896420b8427913fa772414
      1112d366b6

Fix: 236147652
Test: atest CtsInputMethodTestCases:InProcessImeTest
Change-Id: I56f3198e54f689adc9541f2c2644ee19bcc6deed
2022-06-16 09:47:12 -07:00
Vadim Caen
aa48dc3c2d Prevent callback registration when back flag is disabled
When the enableOnBackInvokedCallback is set to false (or not set),
registering an OnBackInvokedCallback should be a no-op to avoid
overriding the default compat callback.

Test: Manual testing registering a callback on an app with the flag
disabled and doing a back gesture. Currently we don't have test
executing a back gesture so automated tests are not possible

Bug: 235206960

Change-Id: I54d843f11130a78ed5a68cbe4722e601a2086ee1
2022-06-16 12:41:46 +00:00
Yohei Yukawa
026d885cf7 Rename InputMethodSessionWrapper to IInputMethodSessionInvoker
This CL renames

  InputMethodSessionWrapper

to

  IInputMethodSessionInvoker

for better consistency with other wrapper classes.

Other than that, there should be no change in this CL.

Bug: 234882948
Test: presubmit
Change-Id: I19dd92a538cd07ad506f3f27dcffdbe86799950f
2022-06-15 16:46:28 -07:00
An An Yu
abc0d8876b Merge "Setup T style clear top transition animation for ActivityEmbedding." into tm-qpr-dev am: 37b3f06461 am: 0b81c263d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18416106

Change-Id: I8fb80e0422cd40813c14cf9b769b15ca7bd0c1e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 21:59:17 +00:00
An An Yu
0b81c263d1 Merge "Setup T style clear top transition animation for ActivityEmbedding." into tm-qpr-dev am: 37b3f06461
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18416106

Change-Id: Id6d017d790b39df793a82d2bfbe2f87dec61602f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 21:39:29 +00:00
An An Yu
37b3f06461 Merge "Setup T style clear top transition animation for ActivityEmbedding." into tm-qpr-dev 2022-06-15 21:21:21 +00:00
Yunfan Chen
6bc2232a3c Print layout extended by cutout private flag in toString()
This is missing while introduced the new private flag. To include it and
print it out when it's set to help debugging layout related issue.

Bug: 236101339
Test: LayoutParams#toString()
Change-Id: Ifa37a989f497f6f6d0f4d2ac2f884f83d537c9aa
2022-06-15 18:29:20 +09:00
Automerger Merge Worker
9d05549738 Merge "Merge "Make sure the relayoutWindow is called when Activity restarted" into tm-dev am: 909495e9d6 am: 046ee5ce74 am: c885c27e57" into tm-qpr-dev-plus-aosp am: 64e95fe1de
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18886507

Change-Id: Ia17f05eb91021c25a51bc42144ea9e765d65471f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:41:19 +00:00
Louis Chang
f1e4008d9d Merge "Make sure the relayoutWindow is called when Activity restarted" into tm-dev am: 909495e9d6 am: 046ee5ce74 am: c885c27e57
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18886507

Change-Id: Icc6d5af78ba520240a14aa3234df928e9402406b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:30:54 +00:00
Louis Chang
c885c27e57 Merge "Make sure the relayoutWindow is called when Activity restarted" into tm-dev am: 909495e9d6 am: 046ee5ce74
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18886507

Change-Id: I26d4b5afbc5a00a400a8b54d9d3e205cdcff48ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:22:33 +00:00
Louis Chang
e2aa1639a7 Merge "Make sure the relayoutWindow is called when Activity restarted" into tm-dev am: 909495e9d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18886507

Change-Id: Iece28800aa6cb3ad007e155ee594a760e74ae724
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:18:43 +00:00
Cheng Shi
3ff201a713 Fix the problem that the turn_screen_on Activity does not draw.
A phone call came when the screen was off, displayState may change from Display.STATE_OFF to STATE_ON before registerDisplayListener, which causes ViewRootImpl.mAttachInfo.mDisplayState of InCallActivity to remain Display.STATE_OFF, which causes performDraw to return directly. So we should update ViewRootImpl.mAttachInfo.mDisplayState after registerDisplayListener.

Bug: 235446909

Change-Id: I60b2da453da0ac5c4df6e5a1040defe4bfe726ec
Merged-In: I60b2da453da0ac5c4df6e5a1040defe4bfe726ec
2022-06-15 01:01:28 +00:00
An An Yu
588e1f94d2 Setup T style clear top transition animation for ActivityEmbedding.
This registers system default clear-top xmls and propagate the
showBackdrop flag.
Test: atest RemoteAnimationsControllerTest
Bug: 221048002

Change-Id: I664f7edd181fd7d625b7010a77cd1f7b58fc3113
2022-06-14 13:36:57 -07:00
Pablo Gamito
d1be73ebe8 Merge "Expose transaction id" into tm-qpr-dev am: e58a36c1c3 am: 77ec5b8c3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799654

Change-Id: Ic4cf64a0e34f64b1efe0bf7a0acb4aabe51761e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 17:04:08 +00:00
Tiger Huang
cdd1687f56 Merge "Replace WindowState#getLayoutingAttrs with LayoutParams#forRotation" into tm-qpr-dev am: f017558a95 am: 3e1ad3930f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231784

Change-Id: Ie305a14c01353275fb701270eee4caab6499cee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 17:01:30 +00:00
Pablo Gamito
77ec5b8c3d Merge "Expose transaction id" into tm-qpr-dev am: e58a36c1c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18799654

Change-Id: I5df72b9e9b2c9db416157067ef7c14ac536ec795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 16:06:42 +00:00
Tiger Huang
3e1ad3930f Merge "Replace WindowState#getLayoutingAttrs with LayoutParams#forRotation" into tm-qpr-dev am: f017558a95
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18231784

Change-Id: Id78ec1c17e3375eea1b64f10a5922a2e57edf919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 16:05:35 +00:00
Pablo Gamito
e58a36c1c3 Merge "Expose transaction id" into tm-qpr-dev 2022-06-14 14:41:25 +00:00
Tiger Huang
f017558a95 Merge "Replace WindowState#getLayoutingAttrs with LayoutParams#forRotation" into tm-qpr-dev 2022-06-14 12:36:25 +00:00
Louis Chang
4b91fbf942 Make sure the relayoutWindow is called when Activity restarted
The host visibility was always invisible while making an Activity
window active because the host visibility was updated afterward
(in ActivityThread#handleStartActivity). Therefore, #relayoutWindow
could be skipped and not recreating Surface if the view visibility is
not changed since last traversal.

Bug: 226324982
Test: repro steps on the bug
Change-Id: Id677a375bc2f75b055a9d35c8b8488e97c24eae9
2022-06-14 17:23:42 +08:00
Tiger Huang
c003eacc7c Replace WindowState#getLayoutingAttrs with LayoutParams#forRotation
When LOCAL_LAYOUT is enabled, the client needs to use the params for the
rotation to layout.

Bug: 161810301
Test: presubmit
Change-Id: I41c94970a600a7a4a3d5bcbab9e79adc1d93d72e
2022-06-14 16:31:34 +08:00
Chris Li
394614dee4 Merge "Fix the problem that the turn_screen_on Activity does not draw." into tm-dev-plus-aosp am: 73bfd93217 am: 8c67207294 am: 68a81a2aca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18871668

Change-Id: Iebb8a23f4171b79115ea14517aad29f5a7c90e07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 07:27:02 +00:00
Chris Li
68a81a2aca Merge "Fix the problem that the turn_screen_on Activity does not draw." into tm-dev-plus-aosp am: 73bfd93217 am: 8c67207294
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18871668

Change-Id: I4d84bd9ad38d6ef2ea77a0a310710cbe7220999a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 06:57:57 +00:00
Peter Kalauskas
d8726e6bfb Merge "Invalidate outline only if provider changes" 2022-06-14 06:06:45 +00:00
Cheng Shi
c6c0d0da5c Fix the problem that the turn_screen_on Activity does not draw.
A phone call came when the screen was off, displayState may change from
Display.STATE_OFF to STATE_ON before registerDisplayListener, which
causes ViewRootImpl.mAttachInfo.mDisplayState of InCallActivity to
remain Display.STATE_OFF, which causes performDraw to return directly.
So we should update ViewRootImpl.mAttachInfo.mDisplayState after
registerDisplayListener.

Bug: 235446909
Test: pass existing
Change-Id: I60b2da453da0ac5c4df6e5a1040defe4bfe726ec
2022-06-14 00:37:24 +00:00
Chavi Weingarten
d4d92418a5 Merge "Make sure VRI waits for SV to draw before report" into tm-dev am: 4c2c7ebfaa am: 1ee9e52fe4 am: acc2838241 am: f903fa8445
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18820396

Change-Id: Iad402c861add070289d2199dfdc239172b8e1386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 00:29:58 +00:00
Chavi Weingarten
acc2838241 Merge "Make sure VRI waits for SV to draw before report" into tm-dev am: 4c2c7ebfaa am: 1ee9e52fe4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18820396

Change-Id: I8284e93eeac89f6693ccef251ceda92db41d0b85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 23:38:17 +00:00
Peter Kalauskas
f8631c6ddc Invalidate outline only if provider changes
Test: android.uirendering.cts.testclasses.ViewClippingTests
Bug: 231054525
Change-Id: Ibeb4e4a0b44b894fb98748423903b4e544c3ccc3
2022-06-13 22:38:15 +00:00
Yohei Yukawa
3e56ef4e06 Merge "Move *InlineSuggestions* to com.android.internal.inputmethod" 2022-06-13 15:10:26 +00:00
Tiger Huang
e8602a37ab Merge "Fix InsetsState#calculateUncontrollableInsetsFromFrame" into tm-qpr-dev am: 12b430a7a0 am: 7fde64b47a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18670487

Change-Id: I4d796620f5c9552ba504ec43eb18f2cd74283308
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 13:05:21 +00:00
Tiger Huang
12b430a7a0 Merge "Fix InsetsState#calculateUncontrollableInsetsFromFrame" into tm-qpr-dev 2022-06-13 12:28:18 +00:00