Skip to content

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

Merged
pull[bot] merged 30 commits into
MaxMood96:androidx-mainfrom
androidx:androidx-main
Jun 12, 2026
Merged

[pull] androidx-main from androidx:androidx-main#1182
pull[bot] merged 30 commits into
MaxMood96:androidx-mainfrom
androidx:androidx-main

Conversation

@pull

@pull pull Bot commented Jun 12, 2026

Copy link
Copy Markdown

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 : )

Yen-Chieh Sung and others added 30 commits June 8, 2026 16:45
Bug: 439850795
Test: presubmit
Change-Id: I6d7a8af4513621a2832636b5e571d00aa9536125
* This actually does not work when the output trace file is a zip container.
* Adds a lot of unnecessary complexity to the management of trace files generated.

Test: Updated unit tests.
Relnote: Simplified Perfetto trace capture on device.
Change-Id: I488105051127008a7f6f75134b5355746f86d5f2
Relnote: Allow `@DoNotInline` to be applied to fields.
Bug: 521434897
Test: N/A
Change-Id: I99120a1351e1e07c7f446764bf20c59492759bad
…TouchInteraction

The internal tracking state isInTouchMode for TextFieldSelectionState is misleading, as it does not accurately map to the global concept of touchMode in Android (e.g. View.isInTouchMode). Instead, it tracks whether the user's last direct interaction with the text field was via a touch/stylus pointer (as opposed to mouse/touchpad, hardware keyboard, or IME navigation). This pure refactoring change renames isInTouchMode and its associated functions, parameters, test variables, and comments to accurately reflect its purpose as tracking direct touch interaction.

Test: ./gradlew :compose:foundation:foundation:testAndroid ./gradlew :compose:foundation:foundation:testAndroidHostTest
Relnote: N/A
Change-Id: Ib603c5c14eda74ad7ad6d4452cf53ba6aef67d60
(Also the corresponding extension function, though the static API is
preferred for Java consumers.)

Relnote: Add missing Throws annotation to `StrokeInputBatchSerialization.decode`, requiring update from Java consumers of that method.
Test: Presubmits
Change-Id: I83473b1537aafad235707c9c69b2525e08edeb99
Bug: 522256938
Remove ohjerry@ and add jiannan@ and yangshuguo@ to the Autofill OWNERS file.

Change-Id: Ic04b9a7c125f91fc007946d7c0ab9a0c745ed2a7
Previously, KMP projects targeting Apple platforms were published
under the 'androidx_multiplatform_mac' build target. With the
introduction of KLIB cross-compilation support, these projects can now be cross-compiled on non-Mac
hosts as long as they (and their dependencies) do not use C-interop.

This change updates CreateLibraryBuildInfoFileTask to publish Apple
target libraries under the 'androidx' build target, unless the project
or one of its dependencies uses C-interop.

TESTED: ./gradlew :buildSrc-tests:test --tests "androidx.build.buildInfo.CreateLibraryBuildInfoFileTaskTest"
BUG: 496700589
Change-Id: Icd53b7c1c7fa65e3eb42d735c03f0d0038a6121d
… if the nav suite scaffold's content has imePadding set.

Since the height of the bar is subtracted from the content's height the actual content height is less than what the ime padding thinks it is, resulting in added bottom padding the size of the bar's height.

BUG: 389467593
Test: Manual
Relnote: Fix bug where there is extra bottom padding if the nav suite scaffold's content has ime padding set.
Change-Id: I86d9d14f60eb60390e6edf946b9b8c00be8878ac
Adding the normal set of test dependencies to ensure that composeTestRule works correct. It is not clear which of these are required to make post submit pass, so we just add the entire set.

Test: all tests pass
Fixes: 522665831
Change-Id: I75c32fd6c5e076cda39fb4a2b7c513ab5f441728
Change-Id: I764bb3a76bdb3fd843bd5b2f7482adf1c4632c6a
Test: ContainerNestingTest
Bug: 510833206
Change-Id: I02b729c9dc63df598f6424dd6450f7403000e9d2
…padding if the nav suite scaffold's content has imePadding set." into androidx-main
Bug: 522895306
Test: Suppressed on local emulator runs
Change-Id: Ic68abe036a98da1932cee7bee71174664353ee38
Cleanup to support move to Perfetto TraceProcessor 56.0

Test: PerfettoTraceRuleTest
Relnote: "Update traceprocessor implementation (as well as unbundled
Perfetto Trace capture) to use Perfetto v56.0"

Change-Id: I8fb9d610c519232f0eacb4f8884cb028f831db06
The `androidx.xr.runtime.FieldOfView` class is no longer present, so its keep rule is removed.

Bug: 523315271
Test: Tap
Change-Id: I71184e72eba3b1b415c357cf1731b4eaf24ae72c
Right now the leanback depends on leanback-grid internally, they have
to be released together.

This change unblocks the jetpad release.

Change-Id: I6c182321575622dec3c30927b694b41a8e9f6536
@pull pull Bot locked and limited conversation to collaborators Jun 12, 2026
@pull pull Bot added the ⤵️ pull label Jun 12, 2026
@pull pull Bot merged commit 588602c into MaxMood96:androidx-main Jun 12, 2026
2 of 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.