Skip to content

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

Merged
pull[bot] merged 13 commits into
MaxMood96:androidx-mainfrom
androidx:androidx-main
May 26, 2026
Merged

[pull] androidx-main from androidx:androidx-main#1130
pull[bot] merged 13 commits into
MaxMood96:androidx-mainfrom
androidx:androidx-main

Conversation

@pull
Copy link
Copy Markdown

@pull pull Bot commented May 26, 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 : )

m-sasha and others added 13 commits May 17, 2026 10:28
Test: N/A
Change-Id: I2ade6360d6b1616a2d285b670eba63bcfb8b359e
This is the preparation to remove service module.

Bug: 463909015
Test: local test
Change-Id: If76c79a713069f68ee17359865d5f4b0be21c87d
Update intgeration tests to use base module annotation.

Bug: 463909015
Test: local test
Change-Id: I71e12b7640c18b2849347ad28aa8167dadda15b1
    This is a scripted update of the AndroidX wear-sdk stubs generated by
    /vendor/google_clockwork/sdk/scripts/update-wear-sdk-prebuilts.sh --build_id 15472596 --androidx.

Change-Id: I2ef1c487f9f601fe7a5b20e8b829af279fd03b71
* changes:
  Make compiler handle annotation from base module too
  Duplicate service module classes into base module
Re-enable nested scroll scope fix. Previously we were cleaning the nested lambda to null and checking if the node was detached before using the scope in foundation. However, if the developer only updates UI then the check won't exist in foundation so we need to provide a fix in UI only. Instead of seeing the scope to null I'm setting it to a canceled scope. So any usages after it the nested scroll node detaches will NoOp and we won't hold to the old scope reference (which was the node's coroutine scope and could cause leaks)

Fixes: 505343254
Fixes: 509847892
Fixes: 508717422

Test: Previous tests should pass. Updated existing tests.

Change-Id: Ic0a7afb22a0aea0f932cc18003a1ade1ac8b0654
BUG: 516693109
Change-Id: I195b2b6e4cde3140ff1400fd4c3b316bf1100a04
- Support both Primary and Dismiss gesture actions in indicator
  components instead of only allowing Primary actions.
- Migrate component binding from a fragile boolean state property
  (gestureIndicatorVisible) to a stream-based InteractionSource
  architecture.
- Introduce OneHandedGestureInteraction.Indicate to safely communicate
  active gesture configuration from the GestureManager directly to the
  indicator.

Bug: 512836472
Test: updated tests
Relnote: Expanded `OneHandedGestureIndicator` to support both Primary and Dismiss actions, migrating its binding architecture to `InteractionSource` for automated lifecycle management.
Change-Id: I7e893bf4d2361009e1191a6f067f2a49eddf9b52
@pull pull Bot locked and limited conversation to collaborators May 26, 2026
@pull pull Bot added the ⤵️ pull label May 26, 2026
@pull pull Bot merged commit f987f46 into MaxMood96:androidx-main May 26, 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.

4 participants