Commit Graph

14289 Commits

Author SHA1 Message Date
Automerger Merge Worker
589342127f Merge "Merge "Fine tune animation parameters for IME animations" into rvc-dev am: 08a45d2445 am: 2a392ab3a8 am: 622b881001" into rvc-qpr-dev-plus-aosp am: deca42eae5
Change-Id: If37b6233df72e553a0a9bdb38b0cf21a3d9ba2c1
2020-03-20 11:55:35 +00:00
Jorim Jaggi
08a45d2445 Merge "Fine tune animation parameters for IME animations" into rvc-dev 2020-03-20 11:11:04 +00:00
Jorim Jaggi
5875cca667 Fine tune animation parameters for IME animations
To match spec as mentioned on the bug.

Bug: 151826721
Test: Visual
Change-Id: I1c2a70916e3a41195f5c003b9023c51ebd93eadb
2020-03-19 23:35:24 +01:00
Menghan Li
29799236af Merge "Refines the javadoc of the ReplacementSpan.getContentDescription" into rvc-dev am: b42dfe722c am: 6d54b94a25 am: b71ed67329 am: 438595a067
Change-Id: Ibce383f409df218b11c6dbca71f11d2b2c9678f1
2020-03-19 01:06:44 +00:00
Menghan Li
b42dfe722c Merge "Refines the javadoc of the ReplacementSpan.getContentDescription" into rvc-dev 2020-03-19 00:06:34 +00:00
TreeHugger Robot
893282de55 Merge changes I6f21d272,Ic0f72593 into rvc-dev am: f6567d2ef5 am: 4b13e6e233 am: e12e048338 am: 1bfade05ac
Change-Id: Ib7e7685036e17b4fdc13341fbdd0823e8ebd6095
2020-03-18 22:50:48 +00:00
Robert Carr
bb7964d645 SurfaceControlViewHost: Call die instead of dispatchDetached
Seems more appropriate as this more mirrors the normal release path.
I think everything gets release eventually either way.

Bug: 149591513
Test: Existing tests pass
Change-Id: I6f21d2723e06dbae4e09421efc352c179115bc40
2020-03-18 14:24:38 -07:00
Robert Carr
5af7d62e27 SurfaceView: Release SurfacePackage when done
We release the SurfaceControl assosciated with a Surface package
when accepting a new SurfacePackage, or at time of detached-from-window
this way we don't rely on the finalize method.

Bug: 149591513
Test: Existing tests pass
Change-Id: Ic0f7259394836ee094ed49db73b5986b778b450f
2020-03-18 12:53:28 -07:00
Rob Carr
ee79ab2d35 Merge "SurfacePackage: Add release method" into rvc-dev am: 4841efcfcd am: 1ce32a4d19 am: fc5b25e4da am: 57177f54d8
Change-Id: Idd424f4ecd48aa812ddfefd28d29ae5f0c1f5cc2
2020-03-18 18:26:48 +00:00
Rob Carr
4841efcfcd Merge "SurfacePackage: Add release method" into rvc-dev 2020-03-18 17:13:32 +00:00
Adrian Roos
c47897eef7 Merge "WindowInsetsAnimationController: Add state callback and getters" into rvc-dev am: 269b162622 am: 8879718ea2 am: f82739d36f am: 3803b1f07c
Change-Id: I76f9ddb5c9a21a65b47abb4155de96e2f5d5b179
2020-03-18 17:05:35 +00:00
Adrian Roos
269b162622 Merge "WindowInsetsAnimationController: Add state callback and getters" into rvc-dev 2020-03-18 16:43:10 +00:00
Adrian Roos
5d557edb44 WindowInsetsAnimationController: Add state callback and getters
Adds more comprehensive callbacks and getters for the WindowInsetsAnimationController,
to make it more straight forward to properly use.

Test: atest InsetsControllerTest PendingInsetsControllerTest
Fixes: 151707442
Change-Id: Ida55f609112396c0f6de4c5c4431e0793c2e315e
2020-03-18 12:17:19 +01:00
menghanli
a7d97f7ec5 Refines the javadoc of the ReplacementSpan.getContentDescription
- inconsistent for the doc & API implementation.

Bug: 150472098
Test: Manual test
Change-Id: Idb1e35245487ac161225f1e53c6308541694b481
2020-03-18 18:06:36 +08:00
Wei Wang
a08c94a26e Merge "Send DEVICE_IDLE and DISPLAY_INACTIVE hint from framework" into rvc-dev am: 540c37bae3 am: 659c335a63 am: 1503bcf77e am: acb73918dd
Change-Id: I5054de2e05138eebfc7d42976c8b35af56df9ce4
2020-03-18 04:49:30 +00:00
Wei Wang
540c37bae3 Merge "Send DEVICE_IDLE and DISPLAY_INACTIVE hint from framework" into rvc-dev 2020-03-18 03:57:41 +00:00
Joanne Chung
a41013a17f Merge "Fix broken tests in TextClassifierServiceTest." into rvc-dev am: 6d6ddf4502 am: 06d9593c7d am: b11568c088 am: ba6d052a9b
Change-Id: Id493b9029dc73d4de1e99f849d95edfef4fae384
2020-03-18 03:39:30 +00:00
Joanne Chung
6d6ddf4502 Merge "Fix broken tests in TextClassifierServiceTest." into rvc-dev 2020-03-18 02:27:40 +00:00
Wei Wang
80d224621f Send DEVICE_IDLE and DISPLAY_INACTIVE hint from framework
Bug: 140148621
Test: boot device
Change-Id: I34971fde28a80056c51d3c1501467f975c7e82a2
2020-03-17 16:11:42 -07:00
Robert Carr
d9c9c0cc75 SurfacePackage: Add release method
Oversight, the SurfacePackage holds a reference to the SurfaceControl
which is protected by a close-guard. We need a way to close it
explicitly. Going to follow up with a patch to have SurfaceView
manage the lifetime when the SurfacePackage is consumed, but want
to make sure this explicit release gets in ASAP.

Bug: 149591513
Test: Existing tests pass
Change-Id: I7276a2440c38cc6d859b79b4c3ee57bc122ce2a6
2020-03-17 14:12:53 -07:00
Automerger Merge Worker
422e3c4a78 Merge "Merge "Create a general mapping between window types and inset types." into rvc-dev am: e88d949e0a am: d7f1e2e0c5 am: eaa9580d88" into rvc-qpr-dev-plus-aosp am: 0a5afc0670
Change-Id: I03227c4be7688a7d6503e03390a3915c30ca447f
2020-03-17 18:27:37 +00:00
Automerger Merge Worker
d89536954c Merge "Explicitly exclude IME from Task Snapshots" into rvc-dev am: 7e06b011a0 am: c3ddf59f5f am: 8748cd7cef am: 2a8a973bff
Change-Id: I5e3af7bb55f1b84f21fb97104992b846721b5ac4
2020-03-17 18:27:09 +00:00
Yuncheol Heo
e88d949e0a Merge "Create a general mapping between window types and inset types." into rvc-dev 2020-03-17 18:01:47 +00:00
Rob Carr
7e06b011a0 Merge "Explicitly exclude IME from Task Snapshots" into rvc-dev 2020-03-17 17:56:55 +00:00
Automerger Merge Worker
a6692bd548 Merge "Add WCT call to set container hidden state" into rvc-dev am: a8a123c1ea am: d26dabf11e am: 7a92f56e00 am: 04461c790e
Change-Id: Ib9fe081089119b2f10524e25c94753244ab373d8
2020-03-17 17:16:13 +00:00
Winson Chung
a8a123c1ea Merge "Add WCT call to set container hidden state" into rvc-dev 2020-03-17 16:35:58 +00:00
Automerger Merge Worker
0905864d4e Remove local text classifier and related tests. am: 293bdf360a am: e94d4b04bc am: bc20f5c39b am: 1d304860eb
Change-Id: I8e8f69e0b3b29cce752ad320f988ef70dc96333e
2020-03-17 16:23:55 +00:00
Automerger Merge Worker
fbe23d1777 Merge "Run codegen v15 on inline suggestion data classes" into rvc-dev am: f931471bf4 am: b52593c579 am: 112fd906a4 am: ca9752cbb7
Change-Id: I2ff8a6f53b25341204c3fdf9428f15a1375bc3ef
2020-03-17 15:29:30 +00:00
Automerger Merge Worker
e94d4b04bc Remove local text classifier and related tests. am: 293bdf360a
Change-Id: I466b3f5c6838c87d84f078ba24d7dd19aaf8d015
2020-03-17 12:12:04 +00:00
Tony Mak
a10f2b981a Merge "Remove local text classifier and related tests." into rvc-dev 2020-03-17 11:50:58 +00:00
Joanne Chung
099faf74e6 Fix broken tests in TextClassifierServiceTest.
We introduce SystemTCMetadata in ag/10605740 which centrializes the
needed information for the TCMS to process the requests. Because we
change the getPackageName() logic to return the calling package name
of SystemTCMetadata and the SystemTCMetadata is only created if the
event is from the SystemTC not other TCs. The tests fail because the
SelectionEvent.packageName is not populated.

This cl contains the following changes:
- Return the package name that the SelectionEvent or
TextClassificationContext originated from
- Fix incorrect javadoc of TextClassificationContext.getPackageName
- Always verify the calling package name for onSelectionEvent and
onTextClassifierEvent

Bug: 151614815
Test: atest TextClassifierServiceTest
Test: atest FrameworksCoreTests:android.view.textclassifier
Test: atest FrameworksCoreTests:android.widget.TextViewActivityTest
Test: atest CtsTextClassifierTestCases
Change-Id: Iabe1691d63e3ec6ac834984cf79b60faf9c0e765
2020-03-17 19:20:14 +08:00
TreeHugger Robot
f931471bf4 Merge "Run codegen v15 on inline suggestion data classes" into rvc-dev 2020-03-17 03:13:25 +00:00
Feng Cao
1ee5afacb9 Run codegen v15 on inline suggestion data classes
Test: atest InlineSuggestionsRequestTest
Bug: 151265975

Change-Id: I2e7ce699cc212e6b4e3dd2a7901d5695227990a4
2020-03-16 17:44:56 -07:00
Tony Mak
293bdf360a Remove local text classifier and related tests.
1. libtextclassifier and libtextclassifier-java are no longer built
   into framework/base.
2. Removed local text classifier code
3. Removed local text classifier test code.
   All of them should be already moved to libtextclassifier/tcs side.
4. Unify all the TC related log tags to "androidtc".

BUG: 147412216

Test: mts-tradefed run mts-extservices
Test: atest frameworks/base/core/java/android/view/textclassifier
Test: Sanity test: Smart selection

Change-Id: Icb1076153f51d5674c8a6c58681ffed5aa772149
2020-03-16 20:16:17 +00:00
Automerger Merge Worker
74d5b355e8 Merge "Revert "Revert "WindowInsetsController: Address API feedback""" into rvc-dev am: 146db0e46b am: 7676bd5deb am: 9d9ef86505 am: f4418f9055
Change-Id: I7ab1ee908f6982ce97d272dbc3013e13a95b0056
2020-03-16 17:45:42 +00:00
Adrian Roos
146db0e46b Merge "Revert "Revert "WindowInsetsController: Address API feedback""" into rvc-dev 2020-03-16 17:03:31 +00:00
Yuncheol Heo
13a6eb6f7b Create a general mapping between window types and inset types.
Bug: 145242835
Test: atest WmTests:DisplayPolicyLayoutTests
Change-Id: I2f3a34cfb9f1ed9e2e205ea5a0917f75414bfcff
2020-03-16 15:45:26 +00:00
Automerger Merge Worker
f9714f0a7a Merge "SurfaceControlViewHost: Respond to API feedback" into rvc-dev am: 1660402a5c am: 9dd2d03308 am: 2744208948 am: 8a58ee1b36
Change-Id: I75502afa1d283656732e034abb1b767fbd0fbb96
2020-03-16 03:38:09 +00:00
TreeHugger Robot
1660402a5c Merge "SurfaceControlViewHost: Respond to API feedback" into rvc-dev 2020-03-16 02:24:49 +00:00
Robert Carr
f6878a4316 Add WCT call to set container hidden state
- This can be used for SysUI to control container visibility without
  clobbering the system determined task visibility

Bug: 139371701
Test: atest WmTests:TaskOrganizerTests
Change-Id: I8f54b2c18dd99ab8de5184e27ca4698417a6701e
2020-03-13 20:28:52 -07:00
Automerger Merge Worker
782af18488 Merge "Set mNextServedView as null only when current served view lost focus" into rvc-dev am: 62748d0a66 am: 72b3c8f717 am: c7a582ca2b am: 89848939f5
Change-Id: I67577d7f134d46111857ef45ed85a3c52ec11e76
2020-03-14 01:34:34 +00:00
TreeHugger Robot
62748d0a66 Merge "Set mNextServedView as null only when current served view lost focus" into rvc-dev 2020-03-14 00:26:57 +00:00
Automerger Merge Worker
e66ba1f399 Merge "Notifying the on-device intelligence service when view window insets have changed" into rvc-dev am: a5efb2c838 am: 5d93749f41 am: 820904743e am: 6be8ec485b
Change-Id: I3e5dadf8d12f7d96eb742b9473142ab4788cc15b
2020-03-13 21:58:13 +00:00
Automerger Merge Worker
a874f4c1d8 Merge changes I69b33b0c,If904c85e,I28444df4,I3bfa4580,I88d9667d, ... into rvc-dev am: 5f003f4e10 am: acf0dcaac9 am: b90055f9fb am: 41e6b659eb
Change-Id: I0bc65506a7165ccb2e8c039d1a40a6a68bc30d53
2020-03-13 21:57:48 +00:00
Automerger Merge Worker
f0f050bf48 Merge "InsetAnimationControlImpl: Copy SurfaceControl" into rvc-dev am: 6e2a98a1f8 am: 566f5f054c am: ef282548da am: bba02ac040
Change-Id: If76c292fef3f796d69a222c799644a31d7f16656
2020-03-13 21:30:53 +00:00
Mihir Patel
a5efb2c838 Merge "Notifying the on-device intelligence service when view window insets have changed" into rvc-dev 2020-03-13 21:02:15 +00:00
Selim Cinek
5f003f4e10 Merge changes I69b33b0c,If904c85e,I28444df4,I3bfa4580,I88d9667d, ... into rvc-dev
* changes:
  Decrease avatar and sender name sizes in MessagingStyle
  Fixed various conversation layout appearences
  Implemented FacePile if no group icon is present
  Fixed the behavior of headers in conversation groups
  Ensured correct coloring of badge in dark mode
  Fixed an issue where the bubble badge was visible independent of the icon
  Improved transitions for expanding messaging notifications
  Adjusted single line representation to include a colon
  Made the expand button positioning conditional on expanded state
  Ensured that the sender of the first message is hidden
  Baseline for the new ConversationLayout
2020-03-13 21:01:24 +00:00
Automerger Merge Worker
b142ad4797 Merge "Refine TC request classes." into rvc-dev am: 031fe36d35 am: 94903244ad am: 5c5425a884 am: 881a0b52ac
Change-Id: I1c2baa06b3b0abf8efeca52782aa0d1ece451129
2020-03-13 20:49:48 +00:00
Rob Carr
6e2a98a1f8 Merge "InsetAnimationControlImpl: Copy SurfaceControl" into rvc-dev 2020-03-13 20:18:09 +00:00
Mihir Patel
b73c421753 Notifying the on-device intelligence service when view window insets have changed
bug:137800469

Test: manual
Change-Id: Ia69e273a6646fc15e289f75084a81193e71e1eef
2020-03-13 20:04:25 +00:00