[pull] androidx-main from androidx:androidx-main#952
Merged
pull[bot] merged 54 commits intoMaxMood96:androidx-mainfrom Mar 25, 2026
Merged
[pull] androidx-main from androidx:androidx-main#952pull[bot] merged 54 commits intoMaxMood96:androidx-mainfrom
pull[bot] merged 54 commits intoMaxMood96:androidx-mainfrom
Conversation
…e com.android.appsearch.flags⚠️ This is an AI generated CL, it has been reviewed and LGTM'd to make sure this change can build, pass existing unit tests, pass presubmit checks and is logically correct. Please review closely to make sure it aligns with your business logic and product design. Bug: 467193863 Fixes: 467193863 Test: All TreeHugger presubmit checks passed. Flag: EXEMPT FLAG_REMOVAL OFF_PEAK_PRESUBMIT: true auto-generated-cl: flag-removal-agent Change-Id: I8d577c690a354e81d5a7b859f8bbf0d7d980022d
…tySpace Root) The entity factory APIs introduce a new parent parameter, allowing clients to explicitly provide a parent value during instantiation. We are initially defaulting this value to ActivitySpace Root to prevent breaking changes for internal clients. Once the internal codebase is updated to explicitly set the parent parameter at all call sites, we will upload a second patch to AOSP to change the default value to null and update the release notes accordingly. For more details, see: https://b.corp.google.com/issues/467815223#comment7 Bug: 493468478 Relnote: "Add parent parameter to the public entity factory" Test: Integration test app on the emulator Change-Id: Iafa58c138804e7ccc1171bdb6b0796dcad6cc1d9
To ensure a smooth migration to the new entity factory APIs, we now explicitly set the parent parameter at all call sites within SceneCore. For more details, see: https://b.corp.google.com/issues/467815223#comment7 Bug: 493467910 Test: Passed all unit tests in android.xr.scenecore.scenecore Change-Id: If948b783ccc93d0c7bea5e9cc5c3ee02d72263c7
Bug: 359962905 Change-Id: I7b4647853a6d68f2e91424bdcd6f38d76e87e73c
Test: DrawWithContentTest Change-Id: Ibccfd2f0f6db5e956a71736174444ac2fbc4c882
Test: Emulator Screen recording: https://screencast.googleplex.com/cast/NDkwNjczOTI3NDA4ODQ0OHw0NDczZmNmNS0wNA Bug: 484421916 Change-Id: Id2f8c84fe68f560b995576ccc8a5db2a1554600e
…pper For more information see go/fsfg-drain. Bug: 473597315 Test: ./gradlew \ 📷camera-camera2-pipe:testReleaseUnitTest \ 📷camera-camera2-pipe-testing:testReleaseUnitTest Change-Id: I254905314bcc8e8ac035089e0f348e44e442dd79
This reverts commit d0325d0. Reason for revert: original issue fixed in aosp/4006233 Change-Id: I5f7b435c34438231e5a38c72f878ac33670db1e6
Only requests AutofillManager from context when it is requested by the semantics change or the system. Bug: 487947860 Relnote: Disabled logging autofill input events by default. They are now enabled by calling `ComposeView.setAutofillDebugEnabled`. Test: Existing tests + verified that autofill is not initialized for Pokedex startup. Change-Id: I5b43001bbfabccdf922094bca7c2d6f64b51987f
….None` Matches view behavior which ignore such views when notifying autofill service. Test: AndroidAutofillManagerTest Bug: 487947860 Relnote: """ Setting `ContentDataType.None` in semantics now prevents autofill events from being sent by Compose. This should prevent initialization costs associated with requesting autofill services. """ Change-Id: I8fbda79955e6f83135bcfee5450cb4d0da07f6d2
Relnote: Update InteractionPolicy to an Interface Test: Performed deprecation checks. Tested Clickable on SpatialPanels and SpatialExternalSurface in SpatialCompose. SpatialExternalSurface WAI but SpatialPanels have an upstream bug (b/495938524) Bug: 489817996 Change-Id: I0ff30555d2835d29ce75cd7d729dd5b936bf6631
Previously, SceneCore entity factory APIs implicitly set the ActivitySpace Root as the Entity's parent at runtime. We have introduced a new parent parameter to these factory APIs, allowing callers to explicitly define the parent or pass null (for no parent) during instantiation. Because the default value for this new parameter will eventually change to null, we are proactively passing the ActivitySpace Root (the previous implicit default) at all call sites within ArCore. This ensures a smooth migration and prevents any breaking changes in behavior. For more details, see: https://b.corp.google.com/issues/467815223#comment7 Bug: 493469058 Test: Successfully built the ArCore integration test app Change-Id: I987fc699d8ff128b647a02913936fdc77d25260b
Remove flag isTraversableDelegatesFixEnabled Test: n/a Fixes: 485962494 Relnote: Remove flag isTraversableDelegatesFixEnabled Change-Id: Ia7dfe8bd1b12c83b9c4c8bedd7c8f86bf035a527
Test: Manually tested Bug: 494656909 Change-Id: I8a2feee684b7251a9d0a9cf08d1513a02791e726
Remove flag isDelayPressesUsingGestureConsumptionEnabled Test: n/a Fixes: 485966702 Relnote: Remove flag isDelayPressesUsingGestureConsumptionEnabled Change-Id: I533ddad246b4dc9feead3f109dd8ec096dfa1ae4
Remove flag isNestedDraggablesTouchConflictFixEnabled Test: n/a Fixes: 485966180 Relnote: Remove flag isNestedDraggablesTouchConflictFixEnabled Change-Id: I79e52bb1c60ac0c1111d213d21ec670a6f45dbd7
Currently, Compose allows for the use of variable fonts or downloadable fonts, but not both at the same time. We want to enable variation settings for Google Fonts. Fixes: 223262013 Test: Added new test cases Relnote: Add variation settings to customize downloadable variable fonts Change-Id: Ifdc9339f5b4f1ed9146807742705fc8d7d84b0b4 Merged-In: I420788c2ab10de91ebd8f6cc158ed738962ca516 Merged-In: I390af395ea9ec47f1d7293e2eca4c97db37905bf
…nto androidx-main
AGP requires gradle to be 9.5.0-milestone5 to work For the change in buildSrc/kotlin-dsl-dependency.gradle: Gradle has split the gradle-kotlin-dsl dependency in Gradle 9.5.0 into multiple jars (e.g., gradle-kotlin-dsl-shared-runtime.jar, etc.) The previous implementation of findGradleKotlinDsl() only fetched the main gradle-kotlin-dsl-<version>.jar. Because of this, the classes contained within the other gradle-kotlin-dsl jars (like org.gradle.kotlin.dsl.internal.sharedruntime.codegen.PluginEntryCache) were missing, resulting in `java.lang.NoClassDefFoundError` for the `:buildSrc-tests:test` task when upgrading to Gradle 9.5.0-milestone7 BUG: 495460240 TESTED: CI Change-Id: Ibe7994cacc1300961838b9c3e98883234b0cce7e
* changes: Remove flag isNestedDraggablesTouchConflictFixEnabled Remove flag isDelayPressesUsingGestureConsumptionEnabled
* changes: Ignore autofill events for the elements that specify `ContentDataType.None` Make AutofillManager service request lazy
RectList was previously ignoring the nodes that were placed before parent, but the recent refactoring added assertions for that case. The asserts surfaced a case where nodes were incorrectly placed during alignment lines calculation due to mismatched flags. This change updates all usage sites to reset the flags correctly. Test: RectListIntegrationTest Fixes: 495465528 Change-Id: I1a6eb4aaf2840f15b82440589937ed3cf1cd027d
* changes: Explicitly set the parent parameter at all ArCore call sites Explicitly set the parent parameter at all call sites in SceneCore Add parent parameter to the public entity factory (defaults to ActivitySpace Root)
This CL partially reverts commit 26249ab. The Kotlin code doesn't need to be reverted and the other manifest was reverted in aosp/4006916. Reason for revert: The emulator does not support these values yet. See: b/494656909. ---- Update requiredDisplayCategory to use the short form "xr_projected". The long form "android.hardware.display.category.XR_PROJECTED" is being replaced with the equivalent short form "xr_projected" in AndroidManifest.xml files. Change-Id: I9f866b55791f4e75c61ffbada44148dacf52faa1
Test: Manual&Unit Bug: 495897266 Change-Id: I237b0670cb7c373cca3dde3917a7a68bd945c237
Change-Id: Ia11992f36d6252d8f3c47ecb343efdb32a35bd11
…nto androidx-main
… not specified. Wear Widget background defaults to `surfaceContainerLow` solid color if no other brushes are specified. Test: Manual&Unit Relnote: Add default Wear Widget background when `WearWidgetBrush` is empty or not specified. Change-Id: I8300b8047772ed0bcafbc0d37cd0da8e0307ad88
* This is being done so that apps that run run in PCC, can use WorkManager. * This library will not be published on google maven until we have feedback from 1P and partners, and we have validated parts of the API. Test: N/A Change-Id: I375f7071880da1a2d251498c60f9598653578605
… package com.android.appsearch.flags" into androidx-main
KDocs added for GeospatialState, PlaneType, and PlaneLabel Fixes: 496079583 Test: n/a, kdoc changes only Change-Id: I855903eaba199778031c8c5ffb730a67bcc14a25
Bug: 435257668 Test: N/A Change-Id: I8141afa64790d9b08e8d2ac580c7fe9a35cfae28
…y name."" into androidx-main
…aderWrapper" into androidx-main
Test: ./gradlew checkApi Change-Id: I815060c3fd18b22218527b7da2a725ab84bdde97
* Simplify `PlatformThreadContextElement` and remove layers of indirection. * Improve reference benchmarks to actually measure something similar. Relnote: Simplify and make coroutine context propagation faster. Test: All existing unit tests pass. Ran integration tests. Benchmarks: ``` Before: ------------------------------------------------------------------------- TracingBenchmark.beginEndCoroutine_writeOnly timeNs min 569,901.2, median 572,250.8, max 677,191.4 instructions min 578,649.2, median 579,082.2, max 618,055.4 l1DMisses min 6,189.7, median 6,212.8, max 7,331.4 branchMisses min 9,483.7, median 9,603.5, max 13,940.3 allocationCount min 904.0, median 904.0, max 904.0 After: ------------------------------------------------------------------------- TracingBenchmark.beginEndCoroutine_writeOnly timeNs min 526,690.0, median 528,281.5, max 604,270.0 instructions min 564,428.2, median 564,917.4, max 600,229.9 l1DMisses min 6,477.8, median 6,503.8, max 7,405.2 branchMisses min 8,749.4, median 8,773.7, max 12,621.5 allocationCount min 808.0, median 808.0, max 808.0 ``` Change-Id: Ia62dba4bdfad3dad667b09a17e1e6c70013f788d
…mpty or not specified." into androidx-main
This change introduces a `setMaterial` method on `MeshEntity` to allow updating the material used for a specific mesh subset after the entity has been created. Test: unit tests, manual testing on device BUG: 465450387 Change-Id: Ib1e4099f04bee56e3f014e49410b49edcabe22e4
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
13 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 : )