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

activity/activity-compose/build.gradle

@@ -76,7 +76,6 @@ androidx {
     type = SoftwareType.PUBLISHED_LIBRARY_ONLY_USED_BY_KOTLIN_CONSUMERS
     inceptionYear = "2020"
     description = "Compose integration with Activity"
-    legacyDisableKotlinStrictApiMode = true
     samples(project(":activity:activity-compose:activity-compose-samples"))
 }
 

activity/activity-compose/src/main/java/androidx/activity/compose/LocalActivity.kt

@@ -17,18 +17,21 @@
 package androidx.activity.compose
 
 import android.app.Activity
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.compositionLocalWithComputedDefaultOf
 import androidx.compose.ui.platform.LocalContext
 
 /**
- * Provides the [android.app.Activity] belonging to the current [LocalContext].
+ * Provides the [Activity] belonging to the current [LocalContext].
  *
  * Note, when possible you should always prefer using the finer grained composition locals where
  * available. This API should be used as a fallback when the required API is only available via
- * [android.app.Activity].
+ * [Activity].
  *
  * See [androidx.compose.ui.platform.LocalConfiguration]
  * [androidx.compose.ui.platform.LocalLifecycleOwner] [androidx.compose.ui.platform.LocalView]
  */
-val LocalActivity =
-    compositionLocalWithComputedDefaultOf<Activity?> { findOwner(LocalContext.currentValue) }
+public val LocalActivity: ProvidableCompositionLocal<Activity?> =
+    compositionLocalWithComputedDefaultOf {
+        findOwner(LocalContext.currentValue)
+    }

activity/activity-compose/src/main/java/androidx/activity/compose/ReportDrawn.kt

@@ -82,23 +82,23 @@ private class ReportDrawnComposition(
  * Provides a [FullyDrawnReporterOwner] that can be used by Composables hosted in a
  * [androidx.activity.ComponentActivity].
  */
-object LocalFullyDrawnReporterOwner {
+public object LocalFullyDrawnReporterOwner {
     private val LocalFullyDrawnReporterOwner = compositionLocalOf<FullyDrawnReporterOwner?> { null }
 
     /**
      * Returns current composition local value for the owner or `null` if one has not been provided,
      * one has not been set via [androidx.activity.setViewTreeFullyDrawnReporterOwner], nor is one
      * available by looking at the [LocalContext].
      */
-    val current: FullyDrawnReporterOwner?
+    public val current: FullyDrawnReporterOwner?
         @Composable
         get() =
             LocalFullyDrawnReporterOwner.current
                 ?: LocalView.current.findViewTreeFullyDrawnReporterOwner()
                 ?: findOwner<FullyDrawnReporterOwner>(LocalContext.current)
 
     /** Associates a [LocalFullyDrawnReporterOwner] key to a value. */
-    infix fun provides(
+    public infix fun provides(
         fullyDrawnReporterOwner: FullyDrawnReporterOwner
     ): ProvidedValue<FullyDrawnReporterOwner?> {
         return LocalFullyDrawnReporterOwner.provides(fullyDrawnReporterOwner)
@@ -114,7 +114,7 @@ object LocalFullyDrawnReporterOwner {
  * @sample androidx.activity.compose.samples.ReportDrawnWhenSample
  */
 @Composable
-fun ReportDrawnWhen(predicate: () -> Boolean) {
+public fun ReportDrawnWhen(predicate: () -> Boolean) {
     val fullyDrawnReporter = LocalFullyDrawnReporterOwner.current?.fullyDrawnReporter ?: return
     DisposableEffect(fullyDrawnReporter, predicate) {
         if (fullyDrawnReporter.isFullyDrawnReported) {
@@ -133,7 +133,7 @@ fun ReportDrawnWhen(predicate: () -> Boolean) {
  *
  * @sample androidx.activity.compose.samples.ReportDrawnSample
  */
-@Composable fun ReportDrawn() = ReportDrawnWhen { true }
+@Composable public fun ReportDrawn(): Unit = ReportDrawnWhen { true }
 
 /**
  * Adds [block] to the methods that must complete prior to [Activity.reportFullyDrawn] being called.
@@ -146,7 +146,7 @@ fun ReportDrawnWhen(predicate: () -> Boolean) {
  * @sample androidx.activity.compose.samples.ReportDrawnAfterSample
  */
 @Composable
-fun ReportDrawnAfter(block: suspend () -> Unit) {
+public fun ReportDrawnAfter(block: suspend () -> Unit) {
     val fullyDrawnReporter = LocalFullyDrawnReporterOwner.current?.fullyDrawnReporter ?: return
     LaunchedEffect(block, fullyDrawnReporter) { fullyDrawnReporter.reportWhenComplete(block) }
 }

activity/activity/build.gradle

@@ -57,7 +57,6 @@ androidx {
     type = SoftwareType.PUBLISHED_LIBRARY
     inceptionYear = "2018"
     description = "Provides the base Activity subclass and the relevant hooks to build a composable structure on top."
-    legacyDisableKotlinStrictApiMode = true
 }
 
 baselineProfile {

activity/activity/src/main/java/androidx/activity/BackEventCompat.kt

@@ -26,26 +26,26 @@ import androidx.annotation.VisibleForTesting
 import androidx.navigationevent.NavigationEvent
 
 /** Compat around the [BackEvent] class */
-class BackEventCompat
+public class BackEventCompat
 @VisibleForTesting
 @JvmOverloads
 constructor(
     /**
      * Absolute X location of the touch point of this event in the coordinate space of the view that
      * * received this back event.
      */
-    val touchX: Float,
+    public val touchX: Float,
     /**
      * Absolute Y location of the touch point of this event in the coordinate space of the view that
      * received this back event.
      */
-    val touchY: Float,
+    public val touchY: Float,
     /** Value between 0 and 1 on how far along the back gesture is. */
-    @FloatRange(from = 0.0, to = 1.0) val progress: Float,
+    @FloatRange(from = 0.0, to = 1.0) public val progress: Float,
     /** Indicates which edge the swipe starts from. */
-    val swipeEdge: @SwipeEdge Int,
+    public val swipeEdge: @SwipeEdge Int,
     /** Frame time of the back event. */
-    val frameTimeMillis: Long = 0,
+    public val frameTimeMillis: Long = 0,
 ) {
 
     /**
@@ -57,7 +57,7 @@ constructor(
      * @param backEvent The [BackEvent] instance to convert.
      */
     @RequiresApi(34)
-    constructor(
+    public constructor(
         backEvent: BackEvent
     ) : this(
         touchX = backEvent.touchX,
@@ -75,7 +75,7 @@ constructor(
      *
      * @param navigationEvent The [NavigationEvent] instance to convert.
      */
-    constructor(
+    public constructor(
         navigationEvent: NavigationEvent
     ) : this(
         touchX = navigationEvent.touchX,
@@ -90,7 +90,7 @@ constructor(
     @RestrictTo(RestrictTo.Scope.LIBRARY)
     @Retention(AnnotationRetention.SOURCE)
     @IntDef(EDGE_LEFT, EDGE_RIGHT, EDGE_NONE)
-    annotation class SwipeEdge
+    public annotation class SwipeEdge
 
     /**
      * Convert this [BackEventCompat] object to a [BackEvent] object.
@@ -99,7 +99,7 @@ constructor(
      * @throws UnsupportedOperationException if this API is called on an API prior to 34.
      */
     @RequiresApi(34)
-    fun toBackEvent(): BackEvent {
+    public fun toBackEvent(): BackEvent {
         return if (Build.VERSION.SDK_INT >= 36) {
             BackEvent(touchX, touchY, progress, swipeEdge, frameTimeMillis)
         } else {
@@ -112,7 +112,7 @@ constructor(
      *
      * @return A new [NavigationEvent] object populated with this [BackEventCompat] data.
      */
-    fun toNavigationEvent(): NavigationEvent {
+    public fun toNavigationEvent(): NavigationEvent {
         return NavigationEvent(
             touchX = touchX,
             touchY = touchY,
@@ -127,18 +127,18 @@ constructor(
             "swipeEdge=$swipeEdge, frameTimeMillis=$frameTimeMillis)"
     }
 
-    companion object {
+    public companion object {
         /** Indicates that the edge swipe starts from the left edge of the screen */
-        const val EDGE_LEFT = 0
+        public const val EDGE_LEFT: Int = 0
 
         /** Indicates that the edge swipe starts from the right edge of the screen */
-        const val EDGE_RIGHT = 1
+        public const val EDGE_RIGHT: Int = 1
 
         /**
          * Indicates that the back event was not triggered by an edge swipe back gesture. This
          * applies to cases like using the back button in 3-button navigation or pressing a hardware
          * back button.
          */
-        const val EDGE_NONE = 2
+        public const val EDGE_NONE: Int = 2
     }
 }

activity/activity/src/main/java/androidx/activity/ComponentActivity.kt

@@ -111,7 +111,7 @@ import java.util.concurrent.atomic.AtomicInteger
  * level building blocks are included. Higher level components can then be used as needed without
  * enforcing a deep Activity class hierarchy or strong coupling between components.
  */
-open class ComponentActivity() :
+public open class ComponentActivity() :
     androidx.core.app.ComponentActivity(),
     ContextAware,
     LifecycleOwner,
@@ -143,7 +143,7 @@ open class ComponentActivity() :
     // Lazily recreated from NonConfigurationInstances by val viewModelStore
     private var _viewModelStore: ViewModelStore? = null
     private val reportFullyDrawnExecutor = createFullyDrawnExecutor()
-    override val fullyDrawnReporter by lazy {
+    override val fullyDrawnReporter: FullyDrawnReporter by lazy {
         FullyDrawnReporter(reportFullyDrawnExecutor) { reportFullyDrawn() }
     }
 
@@ -325,7 +325,7 @@ open class ComponentActivity() :
      * required for API 27 and lower or when using the default [android.app.AppComponentFactory].
      */
     @ContentView
-    constructor(@LayoutRes contentLayoutId: Int) : this() {
+    public constructor(@LayoutRes contentLayoutId: Int) : this() {
         this.contentLayoutId = contentLayoutId
     }
 
@@ -389,12 +389,12 @@ open class ComponentActivity() :
      * [lastCustomNonConfigurationInstance].
      */
     @Deprecated("Use a {@link androidx.lifecycle.ViewModel} to store non config state.")
-    open fun onRetainCustomNonConfigurationInstance(): Any? {
+    public open fun onRetainCustomNonConfigurationInstance(): Any? {
         return null
     }
 
     @get:Deprecated("Use a {@link androidx.lifecycle.ViewModel} to store non config state.")
-    open val lastCustomNonConfigurationInstance: Any?
+    public open val lastCustomNonConfigurationInstance: Any?
         /** Return the value previously returned from [onRetainCustomNonConfigurationInstance]. */
         get() {
             val nc = lastNonConfigurationInstance as NonConfigurationInstances?
@@ -430,7 +430,7 @@ open class ComponentActivity() :
      * attach listeners will see them already present.
      */
     @CallSuper
-    open fun initializeViewTreeOwners() {
+    public open fun initializeViewTreeOwners() {
         window.decorView.setViewTreeLifecycleOwner(this)
         window.decorView.setViewTreeViewModelStoreOwner(this)
         window.decorView.setViewTreeSavedStateRegistryOwner(this)
@@ -590,7 +590,7 @@ open class ComponentActivity() :
     /**
      * Called when the activity has detected the user's press of the back key. The
      * [onBackPressedDispatcher] will be given a chance to handle the back button before the default
-     * behavior of [android.app.Activity.onBackPressed] is invoked.
+     * behavior of [Activity.onBackPressed] is invoked.
      *
      * @see onBackPressedDispatcher
      */

activity/activity/src/main/java/androidx/activity/ComponentDialog.kt

@@ -38,7 +38,7 @@ import androidx.savedstate.SavedStateRegistryOwner
 import androidx.savedstate.setViewTreeSavedStateRegistryOwner
 
 /** Base class for dialogs that enables composition of higher level components. */
-open class ComponentDialog
+public open class ComponentDialog
 @JvmOverloads
 constructor(context: Context, @StyleRes themeResId: Int = 0) :
     Dialog(context, themeResId),
@@ -153,7 +153,7 @@ constructor(context: Context, @StyleRes themeResId: Int = 0) :
      * attach listeners will see them already present.
      */
     @CallSuper
-    open fun initializeViewTreeOwners() {
+    public open fun initializeViewTreeOwners() {
         window!!.decorView.setViewTreeLifecycleOwner(this)
         window!!.decorView.setViewTreeOnBackPressedDispatcherOwner(this)
         window!!.decorView.setViewTreeSavedStateRegistryOwner(this)

activity/activity/src/main/java/androidx/activity/EdgeToEdge.kt

@@ -76,7 +76,7 @@ private var Impl: EdgeToEdgeImpl? = null
  */
 @JvmName("enable")
 @JvmOverloads
-fun ComponentActivity.enableEdgeToEdge(
+public fun ComponentActivity.enableEdgeToEdge(
     statusBarStyle: SystemBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT),
     navigationBarStyle: SystemBarStyle = SystemBarStyle.auto(DefaultLightScrim, DefaultDarkScrim),
 ) {
@@ -129,15 +129,15 @@ fun ComponentActivity.enableEdgeToEdge(
 }
 
 /** The style for the status bar or the navigation bar used in [enableEdgeToEdge]. */
-class SystemBarStyle
+public class SystemBarStyle
 private constructor(
     private val lightScrim: Int,
     internal val darkScrim: Int,
     internal val nightMode: Int,
     internal val detectDarkMode: (Resources) -> Boolean,
 ) {
 
-    companion object {
+    public companion object {
 
         /**
          * Creates a new instance of [SystemBarStyle]. This style detects the dark mode
@@ -161,7 +161,7 @@ private constructor(
          */
         @JvmStatic
         @JvmOverloads
-        fun auto(
+        public fun auto(
             @ColorInt lightScrim: Int,
             @ColorInt darkScrim: Int,
             detectDarkMode: (Resources) -> Boolean = { resources ->
@@ -185,7 +185,7 @@ private constructor(
          *   the contrast against the light system icons.
          */
         @JvmStatic
-        fun dark(@ColorInt scrim: Int): SystemBarStyle {
+        public fun dark(@ColorInt scrim: Int): SystemBarStyle {
             return SystemBarStyle(
                 lightScrim = scrim,
                 darkScrim = scrim,
@@ -204,7 +204,7 @@ private constructor(
          *   system icon color is always light. It is expected to be dark.
          */
         @JvmStatic
-        fun light(@ColorInt scrim: Int, @ColorInt darkScrim: Int): SystemBarStyle {
+        public fun light(@ColorInt scrim: Int, @ColorInt darkScrim: Int): SystemBarStyle {
             return SystemBarStyle(
                 lightScrim = scrim,
                 darkScrim = darkScrim,