Skip to content

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

Merged
pull[bot] merged 24 commits intoMaxMood96:androidx-mainfrom
androidx:androidx-main
Apr 11, 2026
Merged

[pull] androidx-main from androidx:androidx-main#998
pull[bot] merged 24 commits intoMaxMood96:androidx-mainfrom
androidx:androidx-main

Conversation

@pull
Copy link
Copy Markdown

@pull pull bot commented Apr 11, 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 : )

mrichards and others added 20 commits April 9, 2026 11:12
Added clarifying comments to remaining LIBRARY_GROUP_PREFIX usages,
and cleaned up a few missed in aosp/4017626

Bug: 452961674
Test: Unit tests are sufficient
Change-Id: Ief9818559a6599fab8cff326151ce392e9a9d31e
Both classes have been migrated from IntDef to custom types.

Both `ANY` constants have been deprecated & restricted: Usages
of `ANY` can be replaced with new `ALL` constant that is a
proper Set containing all the orientation / semantic type constants.

The AnchorEntity factory method has been updated to accept a `Set` rather
than a specific constant. The previous version of the factory is now
deprecated and will be removed in a later CL.

Changing from Ints to the custom types does not cause 1P breakages.
The other potentially breaking API changes for 1Ps have been mitigated
by using deprecation and RestrictTo, which will be cleaned up in b/500464864.

This change is fairly extensive because the use of `ANY` was piped
through the runtime levels, rather than being represented as a Set
throughout.

Test: Manually validated the CUJs for each touched Activity in the test apps.
Bug: 421161788
RelNote: "SceneCore's `PlaneSemanticType` `PlaneOrientation` constants
    have been migrated from Ints to custom types. Their `ANY` constants
    will be removed, clients should explicitly enumerate all desired
    constants instead, or use the new `.ALL` immutable Set constants.
    The `AnchorEntity` factory method now accepts a Set of these types,
    instead of a single value."
Change-Id: Ib10339399d6255907dad0ed135c20f245c967c48
The text of the Animation State in the GLTF Model Animation test case was not displaying normally when using `toString()`. To fix this, explicitly map `GltfAnimation.AnimationState` values to "PLAYING", "STOPPED", and "PAUSED" strings instead of relying on `toString()`.

Bug: 500965079
Test: GltfModelAnimationActivity integration test on the emulator
Change-Id: I4f270266c10b4808c13a9d80875129340d2e9313
Change-Id: I6ea768ca7370d6e8dcaa90e9be20e4e55ef6e80b
Test: None
Change-Id: I502d4a418e4c7c0c4c02ca6552d59263d4f874d2
The icon's tint modifier caches the graphics layer, so even if the painter
changes, the icon remains the same.

Fix: 501465498
Test: IconTest#painter_updatesWhenPainterChanges
Change-Id: If98ec57ffd96a4385b273dee75a57a4b38ebd6d2
The ArCoreTestRule API is a new construct for mocking the "real-world" environment during a unit test. It consists of a collection of TestTrackables which the tester can add, such as planes, that will then be detected by the FakePerceptionRuntime. It also has dedicated mocks for user body parts like hands and eyes, as well as mocks for device-based singletons such as viewpoints, depth maps, and VPS.

Going forward, ARCore unit tests should avoid creating and/or interacting with the Fake* classes directly. They should instead employ the ArCoreTestRule as a kind of emulator with which to test the public-facing API surfaces with real patterns a developer would actually use.

See go/jxr-arcore-unit-testing-strategy

Bug: 479574533
RelNote: Added ArCoreTestRule API, including TestArDevice, TestAugmentableObject, TestDepthMap, TestEye, TestFace, TestGeospatial, TestHand, TestPlane, TestRenderViewpoint, & TestTrackable
Change-Id: I0ad3c7a75510b0078696558fa2e275785c0f3cc5
This CL ports the logic and calculation from FrameServer that calculates
the capacity set on ImageReaders. In FrameServer, the upper bound for
ImageReader capacity ("maxImages") is determined by 64 -
MAX_PIPELINE_DEPTH. This is currently hardcoded in CameraPipe with 54
(64 - 10).

Bug: 476508341
Test: CameraPipe test app
Change-Id: Ic0b1b768494940d115e2f1c097563d9325ad2b5c
…tion"

This reverts commit 4c5d98c.

Reason for revert: G3 drop blocked as this change caused some https://support.google.com/accessibility/android/answer/6378943 failures

Change-Id: Ib6793c92163cf8ea347a2d37b09ab77529c55cfd
Includes necessary updates to relevant Fakes to support new test workflow

Bug: 483110585
Change-Id: I08a253959245b227f6f88446ee3736fb851f2e4a
Bug: 465834229
Change-Id: I01b598f01b23f85bd4be938b00400a8667192673
…fakes

Refer to ARCore: aosp/3946721

Deprecates current scenecore.testing fakes, will remove them after migrated to G3.

Bug: 483229952
Test: Unit tests.

Change-Id: I338d164479263e406b0320013787d0227dcd8277
@pull pull bot locked and limited conversation to collaborators Apr 11, 2026
@pull pull bot added the ⤵️ pull label Apr 11, 2026
@pull pull bot merged commit 7c8fcf3 into MaxMood96:androidx-main Apr 11, 2026
4 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.

4 participants