Skip to content

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

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

[pull] androidx-main from androidx:androidx-main#1142
pull[bot] merged 25 commits into
MaxMood96:androidx-mainfrom
androidx:androidx-main

Conversation

@pull
Copy link
Copy Markdown

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

idzkowski-google and others added 25 commits May 28, 2026 09:51
Bug: 501412050
Test: Manually
Change-Id: I071424c78c3fe8e7c87ea3766ba622ecca4fb3f0
This change modernizes the SpatialAlignment API by standardizing on a
unified align entry point.

Key refactoring changes:
- Renamed the main coordinate method `position` to `align` in
  `SpatialAlignment` and its implementations.
- Removed redundant, axis-specific offset methods (`horizontalOffset`,
  `verticalOffset`, `depthOffset`) from the core interfaces in favor
  of the single `align` entry point.
- Migrated layout and arrangement logic in `SpatialRow`, `SpatialColumn`,
  `SpatialRowColumnMeasurePolicy`, and `SpatialArrangement` to utilize the
  new `align` API.
- Refactored the `SpatialAlignmentTest` suite to test the `align` methods
  directly.

Test: Unit tests are successful and audited the integrated test application in headset.
Relnote: "Renamed `position` to `align` in `SpatialAlignment` and removed individual directional offset methods in favor of a unified `align` API."
Bug: 479805937
Change-Id: I9bdb2a69f416f28ad2390151a97e5ff7fee97c0a
Revert submission 4064663-app_state

Reason for revert: Droidmonitor created revert due to b/517611548. Will be verifying through ABTD before submission.

Fix: 517611548

Reverted changes: /q/submissionid:4064663-app_state

Change-Id: Ic55eb2945c1ce673084d1c61ed7215551906a007
Revert submission 4064663-app_state

Reason for revert: Droidmonitor created revert due to b/517611548. Will be verifying through ABTD before submission.

Fix: 517611548

Reverted changes: /q/submissionid:4064663-app_state

Change-Id: I8bec36bc13d93471fc98fc487c5d44c7ecbec0f1
Introduce new `androidx.core:core-locationbutton-compose` library,
providing a Jetpack Compose integration for the secure, system provided
location button to get location permission. Key features include:
  - Automatic remote rendering on supported platforms (API 37+).
  - Robust local fallback for older API levels.

Bug: 443790957
Test: ./gradlew :core:locationbutton:locationbutton-compose:connectedAndroidTest
Relnote: """Added
the new androidx.core:core-locationbutton-compose library, enabling
developers to easily integrate secure, system-managed location
permission buttons into their Compose applications."""

Change-Id: I94ab8e8de21f542dbdb88fa3e96f89c091db1621
This commit fixes an issue where content disappeared immediately on
interruption to a new target state.

Specifically, this commit prevents A from jump disappearing in the
following sequence:
1. Transition is at state A.
2. Call `animateTo(B)` -> A begins exiting.
3. Call `animateTo(C)` -> Interruption! A must continue to gracefully
   exit rather than abruptly disappearing.

Test: ./gradlew :compose:animation:animation:assembleAndroidTest
Change-Id: I85e6b896831623e74a9b4a2e1d4cff573c6f56cc
Add RemoteTypeface that enables encoding a custom font string into the
document.

BUG: 502907551
Test: Unit tests
Change-Id: If3a744f315d000cd77282c40cc00e1eb6a6a6964
Remove @restricto to make RemoteTypeface API public.

BUG: 502907551
Test: Existing tests
Relnote: Exposed RemoteTypeface API.
Change-Id: Iadfdb9f55fd7f5d7c5523971c8bc6d816a6a6964
…ndroidx-main

* changes:
  Revert "Create new module for  Appstate library"
  Revert "Introduce AppState for managing Compose state"
This reverts commit 42377e2.

Revert submission 4093295-revert-4064663-app_state-GFCKKSVPNN

Reason for revert: Fixing the android test failures

Reverted changes: /q/submissionid:4093295-revert-4064663-app_state-GFCKKSVPNN

Change-Id: I789399050b2c77f98e285ab1753094818790492a
This reverts commit a80a173.

Revert submission 4093295-revert-4064663-app_state-GFCKKSVPNN

Reason for revert: Fixed the android test failures by adding android device targets for testing

Reverted changes: /q/submissionid:4093295-revert-4064663-app_state-GFCKKSVPNN

Change-Id: Icf871a70109b89baa5f0e6d806bc10b8e8083d3d
…KKSVPNN-JZDNNVMYZC" into androidx-main

* changes:
  Revert^2 "Introduce AppState for managing Compose state"
  Revert^2 "Create new module for  Appstate library"
* changes:
  Expose RemoteTypeface API
  Introduce RemoteTypeface
removeLastFrameReferenceAndAcquire.

We will need to make sure the calls that interact with the frameQueue
are thread-safe.

Test: FrameBufferImplTest

Change-Id: I13680b1b726f018a26847e965a216e17f19e8db4
If a `NavController` restores state but is then saved again before `setGraph` is called, the previously restored state was being lost. This commit updates `NavControllerImpl` to properly include `navigatorStateToRestore` and `backStackToRestore` in the saved state, ensuring no state is lost in this scenario.

RelNote: "Fixed an error in Navigation with Fragments where setting the
graph programmatically would fail to be restored properly."
Test: Added test
Bug: 321147435

Change-Id: I412513f82942ba143ded2555bb5d576cb7d3178e
- Integrates OCR Search in PdfViewerFragment.
- Introduces OcrContextRepository for caching OCR results.
- Encapsulates coordinate mapping within OcrContext extensions.
- Simplifies SearchRepository and SelectionStateManager by using the new centralized OCR logic.

Test: ./gradlew :pdf:pdf-viewer:test
Bug: 51640656
Change-Id: I37183fcca779f901b7f123dc237d1d9ec8874e0f
…removeLastFrameReferenceAndAcquire." into androidx-main
This change introduces a new parameterized smoke test for the SceneCore test app, covering various activities and granting necessary permissions. Test dependencies are added to the build.gradle. Additionally, the ImpressApiImpl has been updated to use CancellationException instead of a generic Exception when a coroutine is cancelled, preventing the calling scope from treating cancellations as unhandled exceptions.

Bug: 515426913
Fixes: 515426913
Test: Added instrumented tests
Change-Id: Ibbe93c0147a5e754bc3d45dada5cfb32043e2437
@pull pull Bot locked and limited conversation to collaborators May 29, 2026
@pull pull Bot added the ⤵️ pull label May 29, 2026
@pull pull Bot merged commit f736a94 into MaxMood96:androidx-main May 29, 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.

3 participants