Skip to content

[pull] androidx-main from androidx:androidx-main#899

Merged
pull[bot] merged 30 commits intoMaxMood96:androidx-mainfrom
androidx:androidx-main
Mar 6, 2026
Merged

[pull] androidx-main from androidx:androidx-main#899
pull[bot] merged 30 commits intoMaxMood96:androidx-mainfrom
androidx:androidx-main

Conversation

@pull
Copy link

@pull pull bot commented Mar 6, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

davejmurphy and others added 30 commits March 4, 2026 11:25
Updating the compileSdk to 36 so that scenecore will be able to
depend on exoplayer 1.10.0 for spatial audio.

Bug: 436634048
Test: Manual build of scenecore

Change-Id: I055d284bd2780b814e5a0444299d6b34c09ce565
Currently there are a bunch of warnings in the docs output that some pdf classes which are present in the android-36-ext19 jars but not the android-36 jars cannot be resolved. To enable resolving them, this adds a property configuring the latest sdk extension which is then used to choose which android jars to use in the docs classpath.

This is similar to the property added for the latest compile SDK for docs in aosp/3225382, but it is nullable, so if there are no extension versions for the latest compile SDK it can be unset in order to use non-extension jars for docs.

Bug: 484324711
Test: Checked that with the value set in gradle.properties, the android-36-ext19 jars were used in the classpath provided to dackka, and without the value set the android-36 jars were used. When using android-36-ext19, verified the dackka warning output did not contain unresolved link warnings for various pdf classes added in the extension.
Change-Id: I0663beb66e87e460bc649ffe82956492fd9c6bfe
Relnote: "Remove Entity from PointSourceParams. Instead the Entity will be used
	directly with SpatialAudioTrack, SpatialSoundPool, and
	SpatialMediaPlayer"
Test: Updated unit tests and confirmed point source
	playback in the test app.
Bug: 489421980
Bug: 436634048
Change-Id: Ib3685c5b2dc0afb0e99e9cdfe02b23ae712e25f7
See design doc: go/xr-audio-components

RelNote: Adding spatial audio components
Test: With unit tests and with pending changes to the spatial audio
	test activity.
Bug: 489421980
Bug: 436642086
Bug: 436642499

Change-Id: I39dddfdcb6c55e5d5e760381bed283636ec2df0f
Test: On Emulator

Bug: 433993017
Change-Id: I988ecd59316b970255f1184d3facfb546a2328dd
Relnote: Added CanvasFrontBufferRenderer#execute API
Fixes: 486935851
Test: CanvasFrontBufferedREndererTest#testExecute
Change-Id: Ie82c8fe4b04f23d68a19ffde01fbad0c63d549e6
This prevents deadlocks when the Projected Scenecore Runtime
is created on the Main Thread.

Even if we had @workerthread annotation on session.create,
the Linter isn't guaranteed to detect calls from the main thread,
so it's better to have the explicit runtime check.

Test: Unit Tests and tested on Emulator
BUG: 478248818
Change-Id: I3ea60e0827107b1c4bd250ef2b68a79cf37dc900
Test: ./gradlew buildOnServer

Change-Id: Ica3cac231d5186e809e3da5802200c8037a2175f
When changing state read mode we used to compare the anchor hashes
against the actual anchors. Fix this such that we are comparing the
same types.

Bug: N/A
Test: N/A
Change-Id: I0775b98c3059dd6094142ca8f564cb816548017d
Bug: N/A
Test: N/A
Change-Id: Ib6cd8b5828c22f91b74013d15b529b728eecb933
This allows the client to differentiate between recompositions with
no state reads from composable that have not recomposed yet.

Bug: 488969608
Test: RecompositionTest
Change-Id: If3559c2a62a7633824eb159a54e51e2fc52e5542
This change introduces non-linear font scaling to RemoteCompose, aligning it with Android's accessibility standards for text sizing.

See for implementation explanation: https://docs.google.com/document/d/1JD-j4YGZAUnCVl4NNinZNrdJzrrzE_UIpMf1z4gRaVk/edit?usp=sharing&resourcekey=0-CS-i3fGfpVMK-wD7Rpnm0w

BUG: 477921363
Test: RemoteTextComparisonPreview, RemoteFontScaleConverterTest

Change-Id: I39e946303d447ee65713a0a86db0821930df4df5
When an overlay (such as a dialog) is displayed, the underlying content
should be in the `STARTED` state rather than `RESUMED`. This includes
both overlays and non-overlay entries.

This change updates the `maxLifecycle` calculation to check if `currentOverlayScenes` is empty before allowing the state to reach `RESUMED`.

Note: this does not fix this behavior for Dialogs whose Lifecycle is
handled outside of compose.

RelNote: "`NavDisplay` now ensures that entries that are displayed underneath overlays have their `Lifecycle` capped at `STARTED`. This ensures APIs like `dropUnlessResumed` continue to work when using dialogs."
Test: NavDisplayLifecycleTest
Bug: 483966071
Change-Id: If209fac7b1228a008aa238a43ea108191c89fe6c
Updates the KDoc for [PreviewWrapper] and [PreviewWrapperProvider]
to clarify usage. Adds examples for MultiPreview support,
composite wrappers, and basic theme implementation.

Test: N/A (Docs only)
Bug: 490085948
Change-Id: I3366c12b9b7efdd7d71e93871caeeae58f0723db
Test: ./gradlew updateApi

Change-Id: I1da310e85b999c73a9b427f42f4297cd960a43d5
* changes:
  Return empty state reads for observed composable
  Remove unnecessary named parameter
  Fix mistake
Bug: N/A
Test: N/A
Change-Id: I9c9daac64507f668d160996b3e0649929a57103f
`replacedChildren` is a non-trivial operation that allocates a list and goes over layout nodes.

Test: Existing tests
Change-Id: I7df5b8e0bee0db1db5b85774589a86d6d2d31190
* changes:
  Adding spatial audio components
  Remove Entity from PointSourceParams
  Update :xr compileSdk to 36
@pull pull bot locked and limited conversation to collaborators Mar 6, 2026
@pull pull bot added the ⤵️ pull label Mar 6, 2026
@pull pull bot merged commit e333d44 into MaxMood96:androidx-main Mar 6, 2026
2 of 3 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants