Merge "Fixing merge conflict" into androidx-main
diff --git a/docs-public/build.gradle b/docs-public/build.gradle
index b4d24d9..be108dd 100644
--- a/docs-public/build.gradle
+++ b/docs-public/build.gradle
@@ -14,8 +14,8 @@
docs("androidx.activity:activity-ktx:1.6.0-alpha05")
docs("androidx.ads:ads-identifier:1.0.0-alpha04")
docs("androidx.ads:ads-identifier-provider:1.0.0-alpha04")
- docs("androidx.annotation:annotation:1.4.0")
- docs("androidx.annotation:annotation-experimental:1.2.0")
+ docs("androidx.annotation:annotation:1.5.0-alpha01")
+ docs("androidx.annotation:annotation-experimental:1.3.0-alpha01")
docs("androidx.appcompat:appcompat:1.6.0-alpha05")
docs("androidx.appcompat:appcompat-resources:1.6.0-alpha05")
docs("androidx.appsearch:appsearch:1.1.0-alpha01")
@@ -27,78 +27,78 @@
docs("androidx.arch.core:core-testing:2.1.0")
docs("androidx.asynclayoutinflater:asynclayoutinflater:1.0.0")
docs("androidx.autofill:autofill:1.2.0-beta01")
- docs("androidx.benchmark:benchmark-common:1.1.0")
- docs("androidx.benchmark:benchmark-junit4:1.1.0")
- docs("androidx.benchmark:benchmark-macro:1.1.0")
- docs("androidx.benchmark:benchmark-macro-junit4:1.1.0")
+ docs("androidx.benchmark:benchmark-common:1.2.0-alpha01")
+ docs("androidx.benchmark:benchmark-junit4:1.2.0-alpha01")
+ docs("androidx.benchmark:benchmark-macro:1.2.0-alpha01")
+ docs("androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha01")
docs("androidx.biometric:biometric:1.2.0-alpha04")
docs("androidx.biometric:biometric-ktx:1.2.0-alpha04")
samples("androidx.biometric:biometric-ktx-samples:1.2.0-alpha04")
docs("androidx.browser:browser:1.4.0")
- docs("androidx.camera:camera-camera2:1.2.0-alpha02")
- docs("androidx.camera:camera-core:1.2.0-alpha02")
- docs("androidx.camera:camera-extensions:1.2.0-alpha02")
+ docs("androidx.camera:camera-camera2:1.2.0-alpha04")
+ docs("androidx.camera:camera-core:1.2.0-alpha04")
+ docs("androidx.camera:camera-extensions:1.2.0-alpha04")
stubs(fileTree(dir: "../camera/camera-extensions-stub", include: ["camera-extensions-stub.jar"]))
- docs("androidx.camera:camera-lifecycle:1.2.0-alpha02")
- docs("androidx.camera:camera-mlkit-vision:1.2.0-alpha03")
+ docs("androidx.camera:camera-lifecycle:1.2.0-alpha04")
+ docs("androidx.camera:camera-mlkit-vision:1.2.0-alpha04")
docs("androidx.camera:camera-previewview:1.1.0-beta02")
- docs("androidx.camera:camera-video:1.2.0-alpha01")
- docs("androidx.camera:camera-view:1.2.0-alpha01")
- docs("androidx.car.app:app:1.2.0-rc01")
- docs("androidx.car.app:app-automotive:1.2.0-rc01")
- docs("androidx.car.app:app-projected:1.2.0-rc01")
- docs("androidx.car.app:app-testing:1.2.0-rc01")
+ docs("androidx.camera:camera-video:1.2.0-alpha04")
+ docs("androidx.camera:camera-view:1.2.0-alpha04")
+ docs("androidx.car.app:app:1.3.0-alpha01")
+ docs("androidx.car.app:app-automotive:1.3.0-alpha01")
+ docs("androidx.car.app:app-projected:1.3.0-alpha01")
+ docs("androidx.car.app:app-testing:1.3.0-alpha01")
docs("androidx.cardview:cardview:1.0.0")
- docs("androidx.collection:collection:1.3.0-alpha01")
- docs("androidx.collection:collection-ktx:1.3.0-alpha01")
- docs("androidx.compose.animation:animation:1.3.0-alpha01")
- docs("androidx.compose.animation:animation-core:1.3.0-alpha01")
- docs("androidx.compose.animation:animation-graphics:1.3.0-alpha01")
- samples("androidx.compose.animation:animation-samples:1.3.0-alpha01")
- samples("androidx.compose.animation:animation-core-samples:1.3.0-alpha01")
- samples("androidx.compose.animation:animation-graphics-samples:1.3.0-alpha01")
- docs("androidx.compose.foundation:foundation:1.3.0-alpha01")
- docs("androidx.compose.foundation:foundation-layout:1.3.0-alpha01")
- samples("androidx.compose.foundation:foundation-layout-samples:1.3.0-alpha01")
- samples("androidx.compose.foundation:foundation-samples:1.3.0-alpha01")
- docs("androidx.compose.material3:material3:1.0.0-alpha13")
- samples("androidx.compose.material3:material3-samples:1.0.0-alpha13")
- docs("androidx.compose.material3:material3-window-size-class:1.0.0-alpha13")
- samples("androidx.compose.material3:material3-window-size-class-samples:1.0.0-alpha13")
- docs("androidx.compose.material:material:1.3.0-alpha01")
- docs("androidx.compose.material:material-icons-core:1.3.0-alpha01")
- samples("androidx.compose.material:material-icons-core-samples:1.3.0-alpha01")
- docs("androidx.compose.material:material-ripple:1.3.0-alpha01")
- samples("androidx.compose.material:material-samples:1.3.0-alpha01")
- docs("androidx.compose.runtime:runtime:1.3.0-alpha01")
- docs("androidx.compose.runtime:runtime-livedata:1.3.0-alpha01")
- samples("androidx.compose.runtime:runtime-livedata-samples:1.3.0-alpha01")
- docs("androidx.compose.runtime:runtime-rxjava2:1.3.0-alpha01")
- samples("androidx.compose.runtime:runtime-rxjava2-samples:1.3.0-alpha01")
- docs("androidx.compose.runtime:runtime-rxjava3:1.3.0-alpha01")
- samples("androidx.compose.runtime:runtime-rxjava3-samples:1.3.0-alpha01")
- docs("androidx.compose.runtime:runtime-saveable:1.3.0-alpha01")
- samples("androidx.compose.runtime:runtime-saveable-samples:1.3.0-alpha01")
- samples("androidx.compose.runtime:runtime-samples:1.3.0-alpha01")
- docs("androidx.compose.ui:ui:1.3.0-alpha01")
- docs("androidx.compose.ui:ui-geometry:1.3.0-alpha01")
- docs("androidx.compose.ui:ui-graphics:1.3.0-alpha01")
- samples("androidx.compose.ui:ui-graphics-samples:1.3.0-alpha01")
- docs("androidx.compose.ui:ui-test:1.3.0-alpha01")
- docs("androidx.compose.ui:ui-test-junit4:1.3.0-alpha01")
- samples("androidx.compose.ui:ui-test-samples:1.3.0-alpha01")
- docs("androidx.compose.ui:ui-text:1.3.0-alpha01")
- docs("androidx.compose.ui:ui-text-google-fonts:1.3.0-alpha01")
- samples("androidx.compose.ui:ui-text-samples:1.3.0-alpha01")
- docs("androidx.compose.ui:ui-tooling:1.3.0-alpha01")
- docs("androidx.compose.ui:ui-tooling-data:1.3.0-alpha01")
- docs("androidx.compose.ui:ui-tooling-preview:1.3.0-alpha01")
- docs("androidx.compose.ui:ui-unit:1.3.0-alpha01")
- samples("androidx.compose.ui:ui-unit-samples:1.3.0-alpha01")
- docs("androidx.compose.ui:ui-util:1.3.0-alpha01")
- docs("androidx.compose.ui:ui-viewbinding:1.3.0-alpha01")
- samples("androidx.compose.ui:ui-viewbinding-samples:1.3.0-alpha01")
- samples("androidx.compose.ui:ui-samples:1.3.0-alpha01")
+ docs("androidx.collection:collection:1.3.0-alpha02")
+ docs("androidx.collection:collection-ktx:1.3.0-alpha02")
+ docs("androidx.compose.animation:animation:1.3.0-alpha02")
+ docs("androidx.compose.animation:animation-core:1.3.0-alpha02")
+ docs("androidx.compose.animation:animation-graphics:1.3.0-alpha02")
+ samples("androidx.compose.animation:animation-samples:1.3.0-alpha02")
+ samples("androidx.compose.animation:animation-core-samples:1.3.0-alpha02")
+ samples("androidx.compose.animation:animation-graphics-samples:1.3.0-alpha02")
+ docs("androidx.compose.foundation:foundation:1.3.0-alpha02")
+ docs("androidx.compose.foundation:foundation-layout:1.3.0-alpha02")
+ samples("androidx.compose.foundation:foundation-layout-samples:1.3.0-alpha02")
+ samples("androidx.compose.foundation:foundation-samples:1.3.0-alpha02")
+ docs("androidx.compose.material3:material3:1.0.0-alpha15")
+ samples("androidx.compose.material3:material3-samples:1.0.0-alpha15")
+ docs("androidx.compose.material3:material3-window-size-class:1.0.0-alpha15")
+ samples("androidx.compose.material3:material3-window-size-class-samples:1.0.0-alpha15")
+ docs("androidx.compose.material:material:1.3.0-alpha02")
+ docs("androidx.compose.material:material-icons-core:1.3.0-alpha02")
+ samples("androidx.compose.material:material-icons-core-samples:1.3.0-alpha02")
+ docs("androidx.compose.material:material-ripple:1.3.0-alpha02")
+ samples("androidx.compose.material:material-samples:1.3.0-alpha02")
+ docs("androidx.compose.runtime:runtime:1.3.0-alpha02")
+ docs("androidx.compose.runtime:runtime-livedata:1.3.0-alpha02")
+ samples("androidx.compose.runtime:runtime-livedata-samples:1.3.0-alpha02")
+ docs("androidx.compose.runtime:runtime-rxjava2:1.3.0-alpha02")
+ samples("androidx.compose.runtime:runtime-rxjava2-samples:1.3.0-alpha02")
+ docs("androidx.compose.runtime:runtime-rxjava3:1.3.0-alpha02")
+ samples("androidx.compose.runtime:runtime-rxjava3-samples:1.3.0-alpha02")
+ docs("androidx.compose.runtime:runtime-saveable:1.3.0-alpha02")
+ samples("androidx.compose.runtime:runtime-saveable-samples:1.3.0-alpha02")
+ samples("androidx.compose.runtime:runtime-samples:1.3.0-alpha02")
+ docs("androidx.compose.ui:ui:1.3.0-alpha02")
+ docs("androidx.compose.ui:ui-geometry:1.3.0-alpha02")
+ docs("androidx.compose.ui:ui-graphics:1.3.0-alpha02")
+ samples("androidx.compose.ui:ui-graphics-samples:1.3.0-alpha02")
+ docs("androidx.compose.ui:ui-test:1.3.0-alpha02")
+ docs("androidx.compose.ui:ui-test-junit4:1.3.0-alpha02")
+ samples("androidx.compose.ui:ui-test-samples:1.3.0-alpha02")
+ docs("androidx.compose.ui:ui-text:1.3.0-alpha02")
+ docs("androidx.compose.ui:ui-text-google-fonts:1.3.0-alpha02")
+ samples("androidx.compose.ui:ui-text-samples:1.3.0-alpha02")
+ docs("androidx.compose.ui:ui-tooling:1.3.0-alpha02")
+ docs("androidx.compose.ui:ui-tooling-data:1.3.0-alpha02")
+ docs("androidx.compose.ui:ui-tooling-preview:1.3.0-alpha02")
+ docs("androidx.compose.ui:ui-unit:1.3.0-alpha02")
+ samples("androidx.compose.ui:ui-unit-samples:1.3.0-alpha02")
+ docs("androidx.compose.ui:ui-util:1.3.0-alpha02")
+ docs("androidx.compose.ui:ui-viewbinding:1.3.0-alpha02")
+ samples("androidx.compose.ui:ui-viewbinding-samples:1.3.0-alpha02")
+ samples("androidx.compose.ui:ui-samples:1.3.0-alpha02")
docs("androidx.concurrent:concurrent-futures:1.1.0")
docs("androidx.concurrent:concurrent-futures-ktx:1.1.0")
docs("androidx.contentpager:contentpager:1.0.0")
@@ -113,7 +113,7 @@
docs("androidx.core:core-animation-testing:1.0.0-alpha02")
docs("androidx.core:core:1.9.0-alpha05")
docs("androidx.core:core-ktx:1.9.0-alpha05")
- docs("androidx.core:core-splashscreen:1.0.0-rc01")
+ docs("androidx.core:core-splashscreen:1.0.0")
docs("androidx.cursoradapter:cursoradapter:1.0.0")
docs("androidx.customview:customview:1.2.0-alpha01")
docs("androidx.customview:customview-poolingcontainer:1.0.0-rc01")
@@ -130,19 +130,19 @@
docs("androidx.drawerlayout:drawerlayout:1.1.1")
docs("androidx.dynamicanimation:dynamicanimation:1.1.0-alpha02")
docs("androidx.dynamicanimation:dynamicanimation-ktx:1.0.0-alpha03")
- docs("androidx.emoji2:emoji2:1.2.0-beta01")
- docs("androidx.emoji2:emoji2-bundled:1.2.0-beta01")
- docs("androidx.emoji2:emoji2-views:1.2.0-beta01")
- docs("androidx.emoji2:emoji2-views-helper:1.2.0-beta01")
+ docs("androidx.emoji2:emoji2:1.2.0-rc01")
+ docs("androidx.emoji2:emoji2-bundled:1.2.0-rc01")
+ docs("androidx.emoji2:emoji2-views:1.2.0-rc01")
+ docs("androidx.emoji2:emoji2-views-helper:1.2.0-rc01")
docs("androidx.emoji:emoji:1.2.0-alpha03")
docs("androidx.emoji:emoji-appcompat:1.2.0-alpha03")
docs("androidx.emoji:emoji-bundled:1.2.0-alpha03")
docs("androidx.enterprise:enterprise-feedback:1.1.0")
docs("androidx.enterprise:enterprise-feedback-testing:1.1.0")
docs("androidx.exifinterface:exifinterface:1.3.3")
- docs("androidx.fragment:fragment:1.5.1")
- docs("androidx.fragment:fragment-ktx:1.5.1")
- docs("androidx.fragment:fragment-testing:1.5.1")
+ docs("androidx.fragment:fragment:1.6.0-alpha01")
+ docs("androidx.fragment:fragment-ktx:1.6.0-alpha01")
+ docs("androidx.fragment:fragment-testing:1.6.0-alpha01")
docs("androidx.glance:glance:1.0.0-alpha03")
docs("androidx.glance:glance-appwidget:1.0.0-alpha03")
docs("androidx.glance:glance-appwidget-proto:1.0.0-alpha03")
@@ -191,22 +191,22 @@
docs("androidx.media2:media2-session:1.2.1")
docs("androidx.media2:media2-widget:1.2.1")
docs("androidx.media:media:1.6.0")
- docs("androidx.mediarouter:mediarouter:1.3.0")
- docs("androidx.mediarouter:mediarouter-testing:1.3.0")
- docs("androidx.metrics:metrics-performance:1.0.0-alpha02")
- docs("androidx.navigation:navigation-common:2.5.0")
- docs("androidx.navigation:navigation-common-ktx:2.5.0")
- docs("androidx.navigation:navigation-compose:2.5.0")
- samples("androidx.navigation:navigation-compose-samples:2.5.0")
- docs("androidx.navigation:navigation-dynamic-features-fragment:2.5.0")
- docs("androidx.navigation:navigation-dynamic-features-runtime:2.5.0")
- docs("androidx.navigation:navigation-fragment:2.5.0")
- docs("androidx.navigation:navigation-fragment-ktx:2.5.0")
- docs("androidx.navigation:navigation-runtime:2.5.0")
- docs("androidx.navigation:navigation-runtime-ktx:2.5.0")
- docs("androidx.navigation:navigation-testing:2.5.0")
- docs("androidx.navigation:navigation-ui:2.5.0")
- docs("androidx.navigation:navigation-ui-ktx:2.5.0")
+ docs("androidx.mediarouter:mediarouter:1.3.1")
+ docs("androidx.mediarouter:mediarouter-testing:1.3.1")
+ docs("androidx.metrics:metrics-performance:1.0.0-alpha03")
+ docs("androidx.navigation:navigation-common:2.5.1")
+ docs("androidx.navigation:navigation-common-ktx:2.5.1")
+ docs("androidx.navigation:navigation-compose:2.5.1")
+ samples("androidx.navigation:navigation-compose-samples:2.5.1")
+ docs("androidx.navigation:navigation-dynamic-features-fragment:2.5.1")
+ docs("androidx.navigation:navigation-dynamic-features-runtime:2.5.1")
+ docs("androidx.navigation:navigation-fragment:2.5.1")
+ docs("androidx.navigation:navigation-fragment-ktx:2.5.1")
+ docs("androidx.navigation:navigation-runtime:2.5.1")
+ docs("androidx.navigation:navigation-runtime-ktx:2.5.1")
+ docs("androidx.navigation:navigation-testing:2.5.1")
+ docs("androidx.navigation:navigation-ui:2.5.1")
+ docs("androidx.navigation:navigation-ui-ktx:2.5.1")
docs("androidx.paging:paging-common:3.2.0-alpha01")
docs("androidx.paging:paging-common-ktx:3.2.0-alpha01")
docs("androidx.paging:paging-compose:1.0.0-alpha15")
@@ -250,7 +250,7 @@
docs("androidx.security:security-crypto:1.1.0-alpha03")
docs("androidx.security:security-crypto-ktx:1.1.0-alpha02")
docs("androidx.security:security-identity-credential:1.0.0-alpha03")
- docs("androidx.sharetarget:sharetarget:1.2.0-rc01")
+ docs("androidx.sharetarget:sharetarget:1.2.0-rc02")
docs("androidx.slice:slice-builders:1.1.0-alpha02")
docs("androidx.slice:slice-builders-ktx:1.0.0-alpha08")
docs("androidx.slice:slice-core:1.1.0-alpha02")
@@ -264,6 +264,8 @@
docs("androidx.textclassifier:textclassifier:1.0.0-alpha04")
docs("androidx.tracing:tracing:1.1.0-rc01")
docs("androidx.tracing:tracing-ktx:1.1.0-rc01")
+ docs("androidx.tracing:tracing-perfetto:1.0.0-alpha01")
+ docs("androidx.tracing:tracing-perfetto-common:1.0.0-alpha01")
docs("androidx.transition:transition:1.4.1")
docs("androidx.transition:transition-ktx:1.4.1")
docs("androidx.tvprovider:tvprovider:1.1.0-alpha01")
@@ -273,17 +275,17 @@
docs("androidx.versionedparcelable:versionedparcelable:1.1.1")
docs("androidx.viewpager2:viewpager2:1.1.0-beta01")
docs("androidx.viewpager:viewpager:1.1.0-alpha01")
- docs("androidx.wear.compose:compose-foundation:1.1.0-alpha01")
- samples("androidx.wear.compose:compose-foundation-samples:1.1.0-alpha01")
- docs("androidx.wear.compose:compose-material:1.1.0-alpha01")
- samples("androidx.wear.compose:compose-material-samples:1.1.0-alpha01")
- docs("androidx.wear.compose:compose-navigation:1.1.0-alpha01")
- samples("androidx.wear.compose:compose-navigation-samples:1.1.0-alpha01")
- docs("androidx.wear.tiles:tiles:1.1.0-alpha09")
- docs("androidx.wear.tiles:tiles-material:1.1.0-alpha09")
- docs("androidx.wear.tiles:tiles-proto:1.1.0-alpha09")
- docs("androidx.wear.tiles:tiles-renderer:1.1.0-alpha09")
- docs("androidx.wear.tiles:tiles-testing:1.1.0-alpha09")
+ docs("androidx.wear.compose:compose-foundation:1.1.0-alpha02")
+ samples("androidx.wear.compose:compose-foundation-samples:1.1.0-alpha02")
+ docs("androidx.wear.compose:compose-material:1.1.0-alpha02")
+ samples("androidx.wear.compose:compose-material-samples:1.1.0-alpha02")
+ docs("androidx.wear.compose:compose-navigation:1.1.0-alpha02")
+ samples("androidx.wear.compose:compose-navigation-samples:1.1.0-alpha02")
+ docs("androidx.wear.tiles:tiles:1.1.0-beta01")
+ docs("androidx.wear.tiles:tiles-material:1.1.0-beta01")
+ docs("androidx.wear.tiles:tiles-proto:1.1.0-beta01")
+ docs("androidx.wear.tiles:tiles-renderer:1.1.0-beta01")
+ docs("androidx.wear.tiles:tiles-testing:1.1.0-beta01")
docs("androidx.wear.watchface:watchface:1.1.0")
docs("androidx.wear.watchface:watchface-client:1.1.0")
docs("androidx.wear.watchface:watchface-client-guava:1.1.0")
@@ -309,13 +311,13 @@
samples("androidx.wear:wear-input-samples:1.2.0-alpha01")
docs("androidx.wear:wear-input-testing:1.2.0-alpha02")
docs("androidx.webkit:webkit:1.5.0-beta01")
- docs("androidx.window:window:1.1.0-alpha02")
+ docs("androidx.window:window:1.1.0-alpha03")
stubs(fileTree(dir: "../window/stubs/", include: ["window-sidecar-release-0.1.0-alpha01.aar"]))
stubs("androidx.window:window-extensions:1.0.0-alpha01")
- docs("androidx.window:window-java:1.1.0-alpha02")
- docs("androidx.window:window-rxjava2:1.1.0-alpha02")
- docs("androidx.window:window-rxjava3:1.1.0-alpha02")
- docs("androidx.window:window-testing:1.1.0-alpha02")
+ docs("androidx.window:window-java:1.1.0-alpha03")
+ docs("androidx.window:window-rxjava2:1.1.0-alpha03")
+ docs("androidx.window:window-rxjava3:1.1.0-alpha03")
+ docs("androidx.window:window-testing:1.1.0-alpha03")
docs("androidx.work:work-gcm:2.8.0-alpha02")
docs("androidx.work:work-multiprocess:2.8.0-alpha02")
docs("androidx.work:work-runtime:2.8.0-alpha02")
