Commit Graph

16992 Commits

Author SHA1 Message Date
Joanne Chung
fe5eb89012 Merge "Bug fix: Move the implementation out from View.onTranslationResponse." into sc-dev am: 8b95d38fa4 am: c0a143efa8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14934412

Change-Id: I07b2aa91e041bbf10cf51640f5a83e625da0741b
2021-06-24 02:21:18 +00:00
Joanne Chung
8b95d38fa4 Merge "Bug fix: Move the implementation out from View.onTranslationResponse." into sc-dev 2021-06-24 02:08:40 +00:00
Lucas Dupin
560f89d0be Merge "Disable blurs when in battery saver" into sc-dev am: 26308cd40f am: a5a38b2e02
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15070038

Change-Id: I1b37cb5f40a22b4c06b1e8a826e864d4d95ee27d
2021-06-23 19:24:38 +00:00
Lucas Dupin
26308cd40f Merge "Disable blurs when in battery saver" into sc-dev 2021-06-23 18:40:42 +00:00
Ahaan Ugale
d15f7b1117 Merge changes from topics "cc-composing-update", "cc-merge-equals" into sc-dev am: 5d42257561 am: 3a318f5eff
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14994799

Change-Id: I930ae5311a3b1d1aa31a23fe12e50517ecfcf017
2021-06-23 06:31:17 +00:00
Ahaan Ugale
5d42257561 Merge changes from topics "cc-composing-update", "cc-merge-equals" into sc-dev
* changes:
  ContentCapture: Don't ignore events with changed composing/selection span
  ContentCapture: Notify when Composing region changes.
2021-06-23 05:05:19 +00:00
Lucas Dupin
b5a1455663 Disable blurs when in battery saver
Test: manual
Test: atest NotificationShadeDepthControllerTest
Fixes: 191814337
Change-Id: If751578550b3397d659d3f9f97f6ee4573389a6c
2021-06-22 16:45:35 -07:00
Matt Casey
df0114cea9 Merge "Fix mPositionInWindow to not use global coords" into sc-dev am: 184c61395e am: 768427541d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15029245

Change-Id: I884c19b95d4b3e51ae4cca28c3773e03f47f0fad
2021-06-22 13:14:37 +00:00
Matt Casey
184c61395e Merge "Fix mPositionInWindow to not use global coords" into sc-dev 2021-06-22 12:44:33 +00:00
Adrian Roos
c775760a62 Merge "Insets Animations: Always dispatch onEnd when cancelled" into sc-dev am: e53e6f5c10 am: 37c3d45dec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15029085

Change-Id: I81d253cc380c129a176e086a29fc69ce9b959639
2021-06-22 10:55:56 +00:00
Adrian Roos
e53e6f5c10 Merge "Insets Animations: Always dispatch onEnd when cancelled" into sc-dev 2021-06-22 10:29:08 +00:00
Arthur Hung
9fe6fffe4a Merge "Update transform hint from relayout window (1/2)" into sc-dev am: 4c74c4e33f am: 1fbee783f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14909666

Change-Id: If97d865559259ac2fa34bb60777dcd2a76e76466
2021-06-22 04:09:32 +00:00
Arthur Hung
4c74c4e33f Merge "Update transform hint from relayout window (1/2)" into sc-dev 2021-06-22 03:27:26 +00:00
TreeHugger Robot
78a9fca690 Merge "MotionEvent: Add relative X and Y fields to PointerCoords" into sc-v2-dev am: 84e98dfd76 am: 0445022d79
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14741432

Change-Id: Ibc0af95688cbdfe669eb18035fb55af77f42ff9b
2021-06-22 01:07:04 +00:00
TreeHugger Robot
84e98dfd76 Merge "MotionEvent: Add relative X and Y fields to PointerCoords" into sc-v2-dev 2021-06-22 00:41:37 +00:00
TreeHugger Robot
9229788724 Merge "Added a hidden modelState to indicate model was deleted from device but available still." into sc-dev am: e4724a8e8f am: 13b3e589fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15031542

Change-Id: Ifd193fd373c5cea9b9b48dc988c485e5b8579e3e
2021-06-21 23:37:21 +00:00
TreeHugger Robot
e4724a8e8f Merge "Added a hidden modelState to indicate model was deleted from device but available still." into sc-dev 2021-06-21 23:19:26 +00:00
Adam He
8b25ff8c9f Added a hidden modelState to indicate model was deleted from device but available
still.

Bug: 191518728
Test: atest CtsTranslationTestCases
Change-Id: I16ee0c2514052f9a8d6589646098c043d67a6703
2021-06-21 13:25:20 -07:00
Adrian Roos
29721a1319 Insets Animations: Always dispatch onEnd when cancelled
Previously, we only dispatched onEnd if onStart was already dispatched. However,
some animations might get cancelled after onPrepare but before onStart. In that
case, it is rather tricky for apps to actually cancel the animation.

Now we always dispatch onEnd if onPrepare has been dispatched already.

Fixes: 177983907
Test: atest WindowInsetsAnimationControllerTests
Change-Id: I3fa142110bd5593679f87561c138ed3318034fca
2021-06-21 21:34:51 +02:00
Ahaan Ugale
01315b1089 ContentCapture: Don't ignore events with changed composing/selection span
Currently, if the view has a TEXT_CHANGED event in the buffer with the
same text, the new event is ignored, even if the Composing or Selection
span is changed.

Bug: 184311217
Test: manual - move cursor quickly and check flushed event
Test: atest android.contentcaptureservice.cts.LoginActivityTest
Change-Id: I4de28576b138225f4e64ed93bcb0b9dd3ed0095c
2021-06-21 14:51:57 +00:00
TreeHugger Robot
ad69605425 Merge "Fix potential null error in clearEvents." into sc-dev am: 6ea5a55ac5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15023990

Change-Id: I2c56caf6dbab6ba8d5f6ca404f8a0a7b415395d4
2021-06-21 12:10:12 +00:00
TreeHugger Robot
cedbffebcf Merge "Removing remaining references of ActivityView in fw/base" into sc-dev am: dc86e26f54
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14829810

Change-Id: I07f5d9bd292021dcc1de2249cb844c9fdfdec630
2021-06-21 11:58:03 +00:00
Huihong Luo
666acfce30 Merge "Fix z-order for webview surface control" into sc-dev am: 17410b668f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14414236

Change-Id: I950d70004c3c20f869eba7cec32c3d5f3827086d
2021-06-21 11:52:55 +00:00
Naomi Musgrave
23f427c28b Merge "Revert "Revert "Temporarily exclude Launcher from sandboxing; to be reverted once""" into sc-v2-dev am: faac561d67 am: d80c1a08a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15036278

Change-Id: Ia52ff17a2cea1499cb525f9ba4b61f3bf836fd74
2021-06-21 10:47:25 +00:00
Naomi Musgrave
faac561d67 Merge "Revert "Revert "Temporarily exclude Launcher from sandboxing; to be reverted once""" into sc-v2-dev 2021-06-21 10:23:01 +00:00
Paul Hobbs
5824b89763 Revert "Revert "Temporarily exclude Launcher from sandboxing; to be reverted once""
This reverts commit 202e35b7cf.

Reason for revert: Breaks Launcher tests (b/191395224, http://go/forrest-run/L01400000924167319)
Bug: 191395224
Bug: 191492708
Bug: 191488971
Change-Id: I325a024daed9cf643f7cd2cb9a536637c13262fa
2021-06-21 10:22:45 +00:00
Charles Chen
d51e70f276 Migrate InputMethodService to WindowProviderService am: fc7a1b5b34 am: 3e85eb66f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14597714

Change-Id: I5107af6cf95f26d74752ce4917552dbe2d422fa3
2021-06-21 09:25:54 +00:00
Charles Chen
3e85eb66f4 Migrate InputMethodService to WindowProviderService am: fc7a1b5b34
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14597714

Change-Id: I0f7ef087d7c09605d2ae18264dea754fe68d0689
2021-06-21 09:08:35 +00:00
Charles Chen
235a0bf9bd Merge changes from topic "ime_migration" into sc-v2-dev
* changes:
  Move IME log to WindowTokenClient
  Migrate InputMethodService to WindowProviderService
2021-06-21 08:46:33 +00:00
TreeHugger Robot
86803c41b9 Merge "Fix potential null error in clearEvents." into sc-dev am: 6ea5a55ac5 am: 2c86cecc5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15023990

Change-Id: I8c58b15d7df5c83029175ba6494f7eb69829023c
2021-06-21 03:22:12 +00:00
TreeHugger Robot
6ea5a55ac5 Merge "Fix potential null error in clearEvents." into sc-dev 2021-06-21 02:31:00 +00:00
TreeHugger Robot
36097dcdac Merge "Removing remaining references of ActivityView in fw/base" into sc-dev am: dc86e26f54 am: 8913c7788c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14829810

Change-Id: I0078a183422562b7de3db1e98410bafd5ed2177d
2021-06-19 01:51:59 +00:00
TreeHugger Robot
dc86e26f54 Merge "Removing remaining references of ActivityView in fw/base" into sc-dev 2021-06-19 01:23:12 +00:00
Adam He
e33b1bf4e9 Fix potential null error in clearEvents.
* This is follow up from previous patch to fix an unresolved
comment.

* We're still changing the clearEvents mechanic to not null the list but
actually clear the list of events. We also change when the
flush->clearEvents call happen during the destroy process so it occurs
on the handlerThread when each session does its own cleanup.

Bug: 185162720
Test: atest CtsContentCaptureServiceTestCases
Change-Id: Ide5490903deec8c4bc8aae5dc76b1fadca29dbd0
2021-06-18 14:38:55 -07:00
Huihong Luo
9e6ff5b80c Merge "Fix z-order for webview surface control" into sc-dev am: 17410b668f am: 689eaa846e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14414236

Change-Id: I3af22701e19e09a0c8c67ca02b66008a20fbebfc
2021-06-18 20:28:23 +00:00
Matt Casey
03e826d6b1 Fix mPositionInWindow to not use global coords
Got the wrong number when the window isn't at 0,0.

Bug: 183045126
Test: Examined logs to observe the window's insets didn't affect
      position in window.
Change-Id: Id3190a7422a56cbefc64d30a9961674b4822fcc3
2021-06-18 14:16:18 -04:00
Huihong Luo
34f42fdecd Fix z-order for webview surface control
Set the root surface control transparent, and set the z order of the newly created child surface control to -1.
A new callback is needed to update root surface control in sync from Java side.

Bug: 186750329
Test: use latest APKs from Webview team, play a video, mini toolbar should be visible
Change-Id: I0b37ee8f83fd2b41ff4f2856dbadd31ff6170baf
2021-06-18 10:14:22 -07:00
TreeHugger Robot
cc07581994 Merge "Revert "Temporarily exclude Launcher from sandboxing; to be reverted once"" into sc-v2-dev am: 58ef180354 am: 22855de097
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15012540

Change-Id: I9e1ca0daa4eecb89f3d6070173a30a2abc75174c
2021-06-18 12:28:50 +00:00
TreeHugger Robot
58ef180354 Merge "Revert "Temporarily exclude Launcher from sandboxing; to be reverted once"" into sc-v2-dev 2021-06-18 12:11:48 +00:00
Charles Chen
fc7a1b5b34 Migrate InputMethodService to WindowProviderService
Also introduce IWindowManager#getDisplayIdToLaunchIme to make IMS
be aware of the launched display to prevent extra onConfigurationChanged
callback

Bug: 149463653
Test: atest MultiDisplaySystemDecorationTests CtsInputMethodTestCases
Test: atest ContextTest ContextIsUiContextTest
Test: manual - moving IME between 2 displays and displayArea within
      display - config change received
Test: manual - the app to show IME crashed and focus is set to the
      next task - no config change

Change-Id: Ie565e30ed5dd3f2cfe27355a6dded76dc3adc14b
2021-06-18 11:44:30 +08:00
Ben Lin
1e398917c4 Merge "PiP: Move enter-PiP on-pause logic." into sc-v2-dev am: 5643e20db3 am: a12047dc90
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14754525

Change-Id: Id5a40c0712f75e974aab0e15168d39b67e228e5d
2021-06-17 22:00:13 +00:00
Ben Lin
5643e20db3 Merge "PiP: Move enter-PiP on-pause logic." into sc-v2-dev 2021-06-17 21:50:11 +00:00
Joanne Chung
a9da1722cc Bug fix: Move the implementation out from View.onTranslationResponse.
Keep onTranslationResponse() only to save TranslationResponse. We can
move set TransformationMethod logic to TextViewTranslationCallback.
With the current implementation, if the developers overrides
onTranslationResponse(), they don't have a chance to use the TextView
default ViewTranslationCallback implementation because they don't set
the TranslationTransformation, they must implement their solution. If
we move logic to TextViewViewTranslationCallback and the developers
only overrides onTranslationResponse(), they still have a chance to
use the default TextViewViewTranslationCallback if the developers set
the TranslationResponse for View.

Bug: 178353965
Test: manual to make sure translation still works.
Test: atest CtsTranslationTestCases

Change-Id: Iada7f3efbbc7705ecf962c78e275ed942816707f
2021-06-17 22:12:27 +08:00
Naomi Musgrave
202e35b7cf Revert "Temporarily exclude Launcher from sandboxing; to be reverted once"
This reverts commit 6574e37f7c.

Bug: 179308296
Bug: 186056836
Reason for revert: No longer needed, as Launcher has updated their
approach (verified in sc-v2)

Change-Id: Iadaa4fbf82708cadff518cdb6db973ee402cd094
2021-06-17 13:28:59 +00:00
Arthur Hung
8e0fedbdb1 Update transform hint from relayout window (1/2)
The transform hint is used to prevent allocating a buffer of a different
size when a window is rotated. We return the fixed rotation transform
and pass it to BLASTBufferQueue so the producer can choose to consume
the hint and allocate the buffer with the same size.

Bug: 188893403
Bug: 177029197
Test: atest WmTests
Test: gfxbenchmark
Test: atest libsurfaceflinger_unittest SurfaceFlinger_test
Change-Id: If631984cf6b4b74ccdf19547fd6a63e759ed5732
2021-06-17 12:21:45 +00:00
Yunfan Chen
79f50e814a Merge "Layout status/nav bar and decor window as normal window" into sc-v2-dev am: 56aad85b0d am: 5cc5855633
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14732017

Change-Id: Ic246de91f4357d115fb3481a139505c41437bad4
2021-06-17 02:22:24 +00:00
Yunfan Chen
56aad85b0d Merge "Layout status/nav bar and decor window as normal window" into sc-v2-dev 2021-06-17 01:46:00 +00:00
Ben Lin
6a55435011 PiP: Move enter-PiP on-pause logic.
Previously, we rely on #makeInvisible in other situations as the last
place to enter PIP before activity gets put to stopped (e.g. ARC++).
However with Shell transitions, #makeInvisible is now immediately called
as user starts the transition into Recents, which would cause app to
enter PIP right away. Thus, removing this part of the code, and instead
we will wait until the Recents transition is finished and try to pause
the app with userLeaveHint before visibility is committed.

Also, when shell transition is enabled, make an explicit transition when
dmissing PIP to properly commit the necessary window container changes
to WM. The tranition will just have no animation.

Bug: 165793917
Test: Enable Shell transition, enter PIP via gesture (non-auto enter
case)
Test: Enable Shell transition, dismiss PIP via dismiss bubble

Change-Id: Ic2c8691f5a1f359b822b1874b16a327bc689f34d
2021-06-16 13:32:28 -07:00
Ahaan Ugale
fb12492de7 ContentCapture: Notify when Composing region changes.
Sending the notification from the InputConnection layer reduces the
number of events that are handled (merged) by ContentCapture. We are
also able to handle composing span being removed; at the TextView layer,
we cannot do that as we don't know if the composing span will be added
back, which happens on typing).

Bug: 184311217
Test: manual - append chars, delete chars, replace text, move cursor to
 composing text, move cursor to remove composing span, drag cursor
Test: atest android.contentcaptureservice.cts.LoginActivityTest
Change-Id: I0e9d153cf7ba2734f38cb1b6044eb7b670fb34ad
2021-06-16 10:47:59 -07:00
TreeHugger Robot
2760cb2d3c Merge "ContentCaptureEvent: Log composing and selection indices" into sc-dev am: 8f74aa34ee am: 805862b48d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14960922

Change-Id: Id4ccc3a68d131678a6065ed210bacdb8e7c3171e
2021-06-16 09:18:48 +00:00