Updating Metalava to version 1.2.5

Also regenerating the API txts to match

Bug: 123289576

Test: ./gradlew updateApi && git status

Change-Id: I3e772f3140f4ac4fe2faf419e735423bfbe02f85
diff --git a/activity/api/1.0.0-alpha04.txt b/activity/api/1.0.0-alpha04.txt
index 2e65567..6907f23 100644
--- a/activity/api/1.0.0-alpha04.txt
+++ b/activity/api/1.0.0-alpha04.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.activity {
 
   public class ComponentActivity extends androidx.core.app.ComponentActivity implements androidx.savedstate.bundle.BundleSavedStateRegistryOwner androidx.lifecycle.LifecycleOwner androidx.lifecycle.ViewModelStoreOwner {
diff --git a/activity/api/current.txt b/activity/api/current.txt
index 2e65567..6907f23 100644
--- a/activity/api/current.txt
+++ b/activity/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.activity {
 
   public class ComponentActivity extends androidx.core.app.ComponentActivity implements androidx.savedstate.bundle.BundleSavedStateRegistryOwner androidx.lifecycle.LifecycleOwner androidx.lifecycle.ViewModelStoreOwner {
diff --git a/activity/ktx/api/1.0.0-alpha04.txt b/activity/ktx/api/1.0.0-alpha04.txt
index 7ca91fa..be35c63 100644
--- a/activity/ktx/api/1.0.0-alpha04.txt
+++ b/activity/ktx/api/1.0.0-alpha04.txt
@@ -1,8 +1,9 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.activity {
 
   public final class ActivityViewModelLazyKt {
     ctor public ActivityViewModelLazyKt();
+    method @MainThread public static inline <reified VM extends androidx.lifecycle.ViewModel> kotlin.Lazy<VM>! viewModels(androidx.activity.ComponentActivity, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>! factoryProducer = null);
   }
 
 }
diff --git a/activity/ktx/api/current.txt b/activity/ktx/api/current.txt
index 7ca91fa..be35c63 100644
--- a/activity/ktx/api/current.txt
+++ b/activity/ktx/api/current.txt
@@ -1,8 +1,9 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.activity {
 
   public final class ActivityViewModelLazyKt {
     ctor public ActivityViewModelLazyKt();
+    method @MainThread public static inline <reified VM extends androidx.lifecycle.ViewModel> kotlin.Lazy<VM>! viewModels(androidx.activity.ComponentActivity, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>! factoryProducer = null);
   }
 
 }
diff --git a/annotations/api/1.1.0-alpha01.txt b/annotations/api/1.1.0-alpha01.txt
index 30c0941..d66f9f5 100644
--- a/annotations/api/1.1.0-alpha01.txt
+++ b/annotations/api/1.1.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.annotation {
 
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface AnimRes {
@@ -41,7 +41,7 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface ColorRes {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) @java.lang.annotation.Inherited public @interface ContentView {
+  @java.lang.annotation.Inherited @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public @interface ContentView {
     method @LayoutRes public abstract int value();
   }
 
@@ -128,7 +128,7 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface PluralsRes {
   }
 
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) @Dimension(unit=androidx.annotation.Dimension.PX) public @interface Px {
+  @Dimension(unit=androidx.annotation.Dimension.PX) @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface Px {
   }
 
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface RawRes {
@@ -163,7 +163,7 @@
     method public abstract androidx.annotation.RestrictTo.Scope[] value();
   }
 
-  public static enum RestrictTo.Scope {
+  public enum RestrictTo.Scope {
     enum_constant @Deprecated public static final androidx.annotation.RestrictTo.Scope GROUP_ID;
     enum_constant public static final androidx.annotation.RestrictTo.Scope LIBRARY;
     enum_constant public static final androidx.annotation.RestrictTo.Scope LIBRARY_GROUP;
diff --git a/annotations/api/current.txt b/annotations/api/current.txt
index 30c0941..d66f9f5 100644
--- a/annotations/api/current.txt
+++ b/annotations/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.annotation {
 
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface AnimRes {
@@ -41,7 +41,7 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface ColorRes {
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) @java.lang.annotation.Inherited public @interface ContentView {
+  @java.lang.annotation.Inherited @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target({java.lang.annotation.ElementType.TYPE}) public @interface ContentView {
     method @LayoutRes public abstract int value();
   }
 
@@ -128,7 +128,7 @@
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface PluralsRes {
   }
 
-  @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) @Dimension(unit=androidx.annotation.Dimension.PX) public @interface Px {
+  @Dimension(unit=androidx.annotation.Dimension.PX) @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface Px {
   }
 
   @java.lang.annotation.Documented @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target({java.lang.annotation.ElementType.METHOD, java.lang.annotation.ElementType.PARAMETER, java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.LOCAL_VARIABLE}) public @interface RawRes {
@@ -163,7 +163,7 @@
     method public abstract androidx.annotation.RestrictTo.Scope[] value();
   }
 
-  public static enum RestrictTo.Scope {
+  public enum RestrictTo.Scope {
     enum_constant @Deprecated public static final androidx.annotation.RestrictTo.Scope GROUP_ID;
     enum_constant public static final androidx.annotation.RestrictTo.Scope LIBRARY;
     enum_constant public static final androidx.annotation.RestrictTo.Scope LIBRARY_GROUP;
diff --git a/appcompat/api/1.1.0-alpha02.txt b/appcompat/api/1.1.0-alpha02.txt
index e628e3f..ad4ae2a 100644
--- a/appcompat/api/1.1.0-alpha02.txt
+++ b/appcompat/api/1.1.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.appcompat.app {
 
   public abstract class ActionBar {
@@ -343,13 +343,25 @@
 
 package androidx.appcompat.graphics.drawable {
 
-  public class AnimatedStateListDrawableCompat extends android.graphics.drawable.Drawable implements androidx.core.graphics.drawable.TintAwareDrawable {
+  public class AnimatedStateListDrawableCompat extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback androidx.core.graphics.drawable.TintAwareDrawable {
     ctor public AnimatedStateListDrawableCompat();
     method public void addState(int[], android.graphics.drawable.Drawable, int);
+    method public void addState(int[]!, android.graphics.drawable.Drawable!);
     method public <T extends android.graphics.drawable.Drawable & android.graphics.drawable.Animatable> void addTransition(int, int, T, boolean);
     method public static androidx.appcompat.graphics.drawable.AnimatedStateListDrawableCompat? create(android.content.Context, @DrawableRes int, android.content.res.Resources.Theme?);
     method public static androidx.appcompat.graphics.drawable.AnimatedStateListDrawableCompat! createFromXmlInner(android.content.Context, android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet, android.content.res.Resources.Theme?) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+    method public void draw(android.graphics.Canvas);
+    method public final android.graphics.drawable.Drawable.ConstantState! getConstantState();
+    method public int getOpacity();
     method public void inflate(android.content.Context, android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet, android.content.res.Resources.Theme?) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+    method public void invalidateDrawable(android.graphics.drawable.Drawable);
+    method public void scheduleDrawable(android.graphics.drawable.Drawable, Runnable, long);
+    method public void setAlpha(int);
+    method public void setColorFilter(android.graphics.ColorFilter!);
+    method public void setDither(boolean);
+    method public void setEnterFadeDuration(int);
+    method public void setExitFadeDuration(int);
+    method public void unscheduleDrawable(android.graphics.drawable.Drawable, Runnable);
   }
 
   public class DrawerArrowDrawable extends android.graphics.drawable.Drawable {
diff --git a/appcompat/api/1.1.0-alpha03.txt b/appcompat/api/1.1.0-alpha03.txt
index 93a4ae1..8a87076 100644
--- a/appcompat/api/1.1.0-alpha03.txt
+++ b/appcompat/api/1.1.0-alpha03.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.appcompat.app {
 
   public abstract class ActionBar {
diff --git a/appcompat/api/current.txt b/appcompat/api/current.txt
index 93a4ae1..8a87076 100644
--- a/appcompat/api/current.txt
+++ b/appcompat/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.appcompat.app {
 
   public abstract class ActionBar {
diff --git a/appcompat/resources/api/1.1.0-alpha03.txt b/appcompat/resources/api/1.1.0-alpha03.txt
index 3b82dbb..5499c81 100644
--- a/appcompat/resources/api/1.1.0-alpha03.txt
+++ b/appcompat/resources/api/1.1.0-alpha03.txt
@@ -1,13 +1,25 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.appcompat.graphics.drawable {
 
-  public class AnimatedStateListDrawableCompat extends android.graphics.drawable.Drawable implements androidx.core.graphics.drawable.TintAwareDrawable {
+  public class AnimatedStateListDrawableCompat extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback androidx.core.graphics.drawable.TintAwareDrawable {
     ctor public AnimatedStateListDrawableCompat();
     method public void addState(int[], android.graphics.drawable.Drawable, int);
+    method public void addState(int[]!, android.graphics.drawable.Drawable!);
     method public <T extends android.graphics.drawable.Drawable & android.graphics.drawable.Animatable> void addTransition(int, int, T, boolean);
     method public static androidx.appcompat.graphics.drawable.AnimatedStateListDrawableCompat? create(android.content.Context, @DrawableRes int, android.content.res.Resources.Theme?);
     method public static androidx.appcompat.graphics.drawable.AnimatedStateListDrawableCompat! createFromXmlInner(android.content.Context, android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet, android.content.res.Resources.Theme?) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+    method public void draw(android.graphics.Canvas);
+    method public final android.graphics.drawable.Drawable.ConstantState! getConstantState();
+    method public int getOpacity();
     method public void inflate(android.content.Context, android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet, android.content.res.Resources.Theme?) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+    method public void invalidateDrawable(android.graphics.drawable.Drawable);
+    method public void scheduleDrawable(android.graphics.drawable.Drawable, Runnable, long);
+    method public void setAlpha(int);
+    method public void setColorFilter(android.graphics.ColorFilter!);
+    method public void setDither(boolean);
+    method public void setEnterFadeDuration(int);
+    method public void setExitFadeDuration(int);
+    method public void unscheduleDrawable(android.graphics.drawable.Drawable, Runnable);
   }
 
 }
diff --git a/appcompat/resources/api/current.txt b/appcompat/resources/api/current.txt
index 3b82dbb..5499c81 100644
--- a/appcompat/resources/api/current.txt
+++ b/appcompat/resources/api/current.txt
@@ -1,13 +1,25 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.appcompat.graphics.drawable {
 
-  public class AnimatedStateListDrawableCompat extends android.graphics.drawable.Drawable implements androidx.core.graphics.drawable.TintAwareDrawable {
+  public class AnimatedStateListDrawableCompat extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback androidx.core.graphics.drawable.TintAwareDrawable {
     ctor public AnimatedStateListDrawableCompat();
     method public void addState(int[], android.graphics.drawable.Drawable, int);
+    method public void addState(int[]!, android.graphics.drawable.Drawable!);
     method public <T extends android.graphics.drawable.Drawable & android.graphics.drawable.Animatable> void addTransition(int, int, T, boolean);
     method public static androidx.appcompat.graphics.drawable.AnimatedStateListDrawableCompat? create(android.content.Context, @DrawableRes int, android.content.res.Resources.Theme?);
     method public static androidx.appcompat.graphics.drawable.AnimatedStateListDrawableCompat! createFromXmlInner(android.content.Context, android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet, android.content.res.Resources.Theme?) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+    method public void draw(android.graphics.Canvas);
+    method public final android.graphics.drawable.Drawable.ConstantState! getConstantState();
+    method public int getOpacity();
     method public void inflate(android.content.Context, android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.util.AttributeSet, android.content.res.Resources.Theme?) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
+    method public void invalidateDrawable(android.graphics.drawable.Drawable);
+    method public void scheduleDrawable(android.graphics.drawable.Drawable, Runnable, long);
+    method public void setAlpha(int);
+    method public void setColorFilter(android.graphics.ColorFilter!);
+    method public void setDither(boolean);
+    method public void setEnterFadeDuration(int);
+    method public void setExitFadeDuration(int);
+    method public void unscheduleDrawable(android.graphics.drawable.Drawable, Runnable);
   }
 
 }
diff --git a/arch/core-common/api/2.0.0.txt b/arch/core-common/api/2.0.0.txt
index fd7a0e5..dba1d6a7 100644
--- a/arch/core-common/api/2.0.0.txt
+++ b/arch/core-common/api/2.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.arch.core.util {
 
   public interface Function<I, O> {
diff --git a/arch/core-common/api/current.txt b/arch/core-common/api/current.txt
index fd7a0e5..dba1d6a7 100644
--- a/arch/core-common/api/current.txt
+++ b/arch/core-common/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.arch.core.util {
 
   public interface Function<I, O> {
diff --git a/arch/core-runtime/api/2.0.0-alpha01.txt b/arch/core-runtime/api/2.0.0-alpha01.txt
index d802177..da4f6cc 100644
--- a/arch/core-runtime/api/2.0.0-alpha01.txt
+++ b/arch/core-runtime/api/2.0.0-alpha01.txt
@@ -1 +1 @@
-// Signature format: 2.0
+// Signature format: 3.0
diff --git a/arch/core-runtime/api/current.txt b/arch/core-runtime/api/current.txt
index d802177..da4f6cc 100644
--- a/arch/core-runtime/api/current.txt
+++ b/arch/core-runtime/api/current.txt
@@ -1 +1 @@
-// Signature format: 2.0
+// Signature format: 3.0
diff --git a/arch/core-testing/api/2.0.0.txt b/arch/core-testing/api/2.0.0.txt
index 1ae677c..7eb7fe1 100644
--- a/arch/core-testing/api/2.0.0.txt
+++ b/arch/core-testing/api/2.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.arch.core.executor.testing {
 
   public class CountingTaskExecutorRule extends org.junit.rules.TestWatcher {
diff --git a/arch/core-testing/api/current.txt b/arch/core-testing/api/current.txt
index 1ae677c..7eb7fe1 100644
--- a/arch/core-testing/api/current.txt
+++ b/arch/core-testing/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.arch.core.executor.testing {
 
   public class CountingTaskExecutorRule extends org.junit.rules.TestWatcher {
diff --git a/asynclayoutinflater/api/1.0.0.txt b/asynclayoutinflater/api/1.0.0.txt
index 0b5a843..a729b12 100644
--- a/asynclayoutinflater/api/1.0.0.txt
+++ b/asynclayoutinflater/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.asynclayoutinflater.view {
 
   public final class AsyncLayoutInflater {
diff --git a/asynclayoutinflater/api/current.txt b/asynclayoutinflater/api/current.txt
index 0b5a843..a729b12 100644
--- a/asynclayoutinflater/api/current.txt
+++ b/asynclayoutinflater/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.asynclayoutinflater.view {
 
   public final class AsyncLayoutInflater {
diff --git a/biometric/api/1.0.0-alpha04.txt b/biometric/api/1.0.0-alpha04.txt
index fbc7f7a..f517f0f 100644
--- a/biometric/api/1.0.0-alpha04.txt
+++ b/biometric/api/1.0.0-alpha04.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.biometric {
 
   public class BiometricPrompt {
diff --git a/biometric/api/current.txt b/biometric/api/current.txt
index fbc7f7a..f517f0f 100644
--- a/biometric/api/current.txt
+++ b/biometric/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.biometric {
 
   public class BiometricPrompt {
diff --git a/browser/api/1.0.0.txt b/browser/api/1.0.0.txt
index 06890b2..a1ecbdd 100644
--- a/browser/api/1.0.0.txt
+++ b/browser/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.browser.browseractions {
 
   public class BrowserActionItem {
diff --git a/browser/api/current.txt b/browser/api/current.txt
index 06890b2..a1ecbdd 100644
--- a/browser/api/current.txt
+++ b/browser/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.browser.browseractions {
 
   public class BrowserActionItem {
diff --git a/buildSrc/src/main/kotlin/androidx/build/metalava/CheckApiCompatibilityTask.kt b/buildSrc/src/main/kotlin/androidx/build/metalava/CheckApiCompatibilityTask.kt
index 84678ba..a0004d7 100644
--- a/buildSrc/src/main/kotlin/androidx/build/metalava/CheckApiCompatibilityTask.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/metalava/CheckApiCompatibilityTask.kt
@@ -79,7 +79,6 @@
                 apiFile.toString(),
 
                 "--compatible-output=no",
-                "--omit-common-packages=yes",
                 "--input-kotlin-nulls=yes"
         )
         if (checkRestrictedApis) {
diff --git a/buildSrc/src/main/kotlin/androidx/build/metalava/GenerateApiTask.kt b/buildSrc/src/main/kotlin/androidx/build/metalava/GenerateApiTask.kt
index 3fce37a..7302a39 100644
--- a/buildSrc/src/main/kotlin/androidx/build/metalava/GenerateApiTask.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/metalava/GenerateApiTask.kt
@@ -62,8 +62,7 @@
             "--api",
             publicApiFile.toString(),
 
-            "--compatible-output=no",
-            "--omit-common-packages=yes",
+            "--format=v3",
             "--output-kotlin-nulls=yes"
         )
 
@@ -83,8 +82,7 @@
                 "--show-annotation",
                 "androidx.annotation.RestrictTo",
 
-                "--compatible-output=no",
-                "--omit-common-packages=yes",
+                "--format=v3",
                 "--output-kotlin-nulls=yes"
             )
 
diff --git a/buildSrc/src/main/kotlin/androidx/build/metalava/Metalava.kt b/buildSrc/src/main/kotlin/androidx/build/metalava/Metalava.kt
index 45263b0..a0d763a 100644
--- a/buildSrc/src/main/kotlin/androidx/build/metalava/Metalava.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/metalava/Metalava.kt
@@ -36,7 +36,7 @@
 object Metalava {
     private fun Project.createMetalavaConfiguration(): Configuration {
         return configurations.create("metalava") {
-            val dependency = dependencies.create("com.android:metalava:1.1.2-SNAPSHOT:shadow@jar")
+            val dependency = dependencies.create("com.android:metalava:1.2.5-SNAPSHOT:shadow@jar")
             it.dependencies.add(dependency)
         }
     }
diff --git a/car/cluster/api/1.0.0-alpha5.txt b/car/cluster/api/1.0.0-alpha5.txt
index 8b9cf5a..bcdbdbb 100644
--- a/car/cluster/api/1.0.0-alpha5.txt
+++ b/car/cluster/api/1.0.0-alpha5.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.car.cluster.navigation {
 
   public final class Destination implements androidx.versionedparcelable.VersionedParcelable {
@@ -21,7 +21,7 @@
     method public androidx.car.cluster.navigation.Destination.Builder setTraffic(androidx.car.cluster.navigation.Destination.Traffic, androidx.car.cluster.navigation.Destination.Traffic...);
   }
 
-  public static enum Destination.Traffic {
+  public enum Destination.Traffic {
     enum_constant public static final androidx.car.cluster.navigation.Destination.Traffic HIGH;
     enum_constant public static final androidx.car.cluster.navigation.Destination.Traffic LOW;
     enum_constant public static final androidx.car.cluster.navigation.Destination.Traffic MEDIUM;
@@ -35,7 +35,7 @@
     method public int getMeters();
   }
 
-  public static enum Distance.Unit {
+  public enum Distance.Unit {
     enum_constant public static final androidx.car.cluster.navigation.Distance.Unit FEET;
     enum_constant public static final androidx.car.cluster.navigation.Distance.Unit KILOMETERS;
     enum_constant public static final androidx.car.cluster.navigation.Distance.Unit METERS;
@@ -81,7 +81,7 @@
     method public androidx.car.cluster.navigation.LaneDirection.Builder setShape(androidx.car.cluster.navigation.LaneDirection.Shape, androidx.car.cluster.navigation.LaneDirection.Shape...);
   }
 
-  public static enum LaneDirection.Shape {
+  public enum LaneDirection.Shape {
     enum_constant public static final androidx.car.cluster.navigation.LaneDirection.Shape NORMAL_LEFT;
     enum_constant public static final androidx.car.cluster.navigation.LaneDirection.Shape NORMAL_RIGHT;
     enum_constant public static final androidx.car.cluster.navigation.LaneDirection.Shape SHARP_LEFT;
@@ -114,7 +114,7 @@
     method public androidx.car.cluster.navigation.Maneuver.Builder setType(androidx.car.cluster.navigation.Maneuver.Type, androidx.car.cluster.navigation.Maneuver.Type...);
   }
 
-  public static enum Maneuver.Type {
+  public enum Maneuver.Type {
     enum_constant public static final androidx.car.cluster.navigation.Maneuver.Type DEPART;
     enum_constant public static final androidx.car.cluster.navigation.Maneuver.Type DESTINATION;
     enum_constant public static final androidx.car.cluster.navigation.Maneuver.Type DESTINATION_LEFT;
@@ -189,7 +189,7 @@
     method public androidx.car.cluster.navigation.NavigationState.Builder setServiceStatus(androidx.car.cluster.navigation.NavigationState.ServiceStatus, androidx.car.cluster.navigation.NavigationState.ServiceStatus...);
   }
 
-  public static enum NavigationState.ServiceStatus {
+  public enum NavigationState.ServiceStatus {
     enum_constant public static final androidx.car.cluster.navigation.NavigationState.ServiceStatus NORMAL;
     enum_constant public static final androidx.car.cluster.navigation.NavigationState.ServiceStatus REROUTING;
   }
diff --git a/car/cluster/api/current.txt b/car/cluster/api/current.txt
index 8b9cf5a..bcdbdbb 100644
--- a/car/cluster/api/current.txt
+++ b/car/cluster/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.car.cluster.navigation {
 
   public final class Destination implements androidx.versionedparcelable.VersionedParcelable {
@@ -21,7 +21,7 @@
     method public androidx.car.cluster.navigation.Destination.Builder setTraffic(androidx.car.cluster.navigation.Destination.Traffic, androidx.car.cluster.navigation.Destination.Traffic...);
   }
 
-  public static enum Destination.Traffic {
+  public enum Destination.Traffic {
     enum_constant public static final androidx.car.cluster.navigation.Destination.Traffic HIGH;
     enum_constant public static final androidx.car.cluster.navigation.Destination.Traffic LOW;
     enum_constant public static final androidx.car.cluster.navigation.Destination.Traffic MEDIUM;
@@ -35,7 +35,7 @@
     method public int getMeters();
   }
 
-  public static enum Distance.Unit {
+  public enum Distance.Unit {
     enum_constant public static final androidx.car.cluster.navigation.Distance.Unit FEET;
     enum_constant public static final androidx.car.cluster.navigation.Distance.Unit KILOMETERS;
     enum_constant public static final androidx.car.cluster.navigation.Distance.Unit METERS;
@@ -81,7 +81,7 @@
     method public androidx.car.cluster.navigation.LaneDirection.Builder setShape(androidx.car.cluster.navigation.LaneDirection.Shape, androidx.car.cluster.navigation.LaneDirection.Shape...);
   }
 
-  public static enum LaneDirection.Shape {
+  public enum LaneDirection.Shape {
     enum_constant public static final androidx.car.cluster.navigation.LaneDirection.Shape NORMAL_LEFT;
     enum_constant public static final androidx.car.cluster.navigation.LaneDirection.Shape NORMAL_RIGHT;
     enum_constant public static final androidx.car.cluster.navigation.LaneDirection.Shape SHARP_LEFT;
@@ -114,7 +114,7 @@
     method public androidx.car.cluster.navigation.Maneuver.Builder setType(androidx.car.cluster.navigation.Maneuver.Type, androidx.car.cluster.navigation.Maneuver.Type...);
   }
 
-  public static enum Maneuver.Type {
+  public enum Maneuver.Type {
     enum_constant public static final androidx.car.cluster.navigation.Maneuver.Type DEPART;
     enum_constant public static final androidx.car.cluster.navigation.Maneuver.Type DESTINATION;
     enum_constant public static final androidx.car.cluster.navigation.Maneuver.Type DESTINATION_LEFT;
@@ -189,7 +189,7 @@
     method public androidx.car.cluster.navigation.NavigationState.Builder setServiceStatus(androidx.car.cluster.navigation.NavigationState.ServiceStatus, androidx.car.cluster.navigation.NavigationState.ServiceStatus...);
   }
 
-  public static enum NavigationState.ServiceStatus {
+  public enum NavigationState.ServiceStatus {
     enum_constant public static final androidx.car.cluster.navigation.NavigationState.ServiceStatus NORMAL;
     enum_constant public static final androidx.car.cluster.navigation.NavigationState.ServiceStatus REROUTING;
   }
diff --git a/car/core/api/1.0.0-alpha6.txt b/car/core/api/1.0.0-alpha6.txt
index 8b4adef..7cd5df3 100644
--- a/car/core/api/1.0.0-alpha6.txt
+++ b/car/core/api/1.0.0-alpha6.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.car.app {
 
   public class CarAlertDialog extends android.app.Dialog {
@@ -82,7 +82,6 @@
   }
 
   public class DrawerItemViewHolder extends androidx.recyclerview.widget.RecyclerView.ViewHolder implements androidx.car.uxrestrictions.OnUxRestrictionsChangedListener {
-    ctor @VisibleForTesting(otherwise=androidx.annotation.VisibleForTesting.PACKAGE_PRIVATE) public DrawerItemViewHolder(android.view.View);
     method public android.widget.TextView? getBodyView();
     method public android.widget.ImageView? getEndIconView();
     method public android.widget.ImageView getIconView();
@@ -248,7 +247,7 @@
     method public androidx.car.widget.CarMenuItem.Builder setTitle(CharSequence);
   }
 
-  public static enum CarMenuItem.DisplayBehavior {
+  public enum CarMenuItem.DisplayBehavior {
     enum_constant public static final androidx.car.widget.CarMenuItem.DisplayBehavior ALWAYS;
     enum_constant public static final androidx.car.widget.CarMenuItem.DisplayBehavior IF_ROOM;
     enum_constant public static final androidx.car.widget.CarMenuItem.DisplayBehavior NEVER;
diff --git a/car/core/api/current.txt b/car/core/api/current.txt
index 8b4adef..7cd5df3 100644
--- a/car/core/api/current.txt
+++ b/car/core/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.car.app {
 
   public class CarAlertDialog extends android.app.Dialog {
@@ -82,7 +82,6 @@
   }
 
   public class DrawerItemViewHolder extends androidx.recyclerview.widget.RecyclerView.ViewHolder implements androidx.car.uxrestrictions.OnUxRestrictionsChangedListener {
-    ctor @VisibleForTesting(otherwise=androidx.annotation.VisibleForTesting.PACKAGE_PRIVATE) public DrawerItemViewHolder(android.view.View);
     method public android.widget.TextView? getBodyView();
     method public android.widget.ImageView? getEndIconView();
     method public android.widget.ImageView getIconView();
@@ -248,7 +247,7 @@
     method public androidx.car.widget.CarMenuItem.Builder setTitle(CharSequence);
   }
 
-  public static enum CarMenuItem.DisplayBehavior {
+  public enum CarMenuItem.DisplayBehavior {
     enum_constant public static final androidx.car.widget.CarMenuItem.DisplayBehavior ALWAYS;
     enum_constant public static final androidx.car.widget.CarMenuItem.DisplayBehavior IF_ROOM;
     enum_constant public static final androidx.car.widget.CarMenuItem.DisplayBehavior NEVER;
diff --git a/car/moderator/api/1.0.0-alpha1.txt b/car/moderator/api/1.0.0-alpha1.txt
index 4ba262d..4c31efc 100644
--- a/car/moderator/api/1.0.0-alpha1.txt
+++ b/car/moderator/api/1.0.0-alpha1.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.car.moderator {
 
   public class SpeedBumpView extends android.widget.FrameLayout {
diff --git a/car/moderator/api/current.txt b/car/moderator/api/current.txt
index 4ba262d..4c31efc 100644
--- a/car/moderator/api/current.txt
+++ b/car/moderator/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.car.moderator {
 
   public class SpeedBumpView extends android.widget.FrameLayout {
diff --git a/cardview/api/1.0.0.txt b/cardview/api/1.0.0.txt
index 0882be1..49fbb11 100644
--- a/cardview/api/1.0.0.txt
+++ b/cardview/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.cardview.widget {
 
   public class CardView extends android.widget.FrameLayout {
diff --git a/cardview/api/current.txt b/cardview/api/current.txt
index 0882be1..49fbb11 100644
--- a/cardview/api/current.txt
+++ b/cardview/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.cardview.widget {
 
   public class CardView extends android.widget.FrameLayout {
diff --git a/collection/api/1.1.0-alpha02.txt b/collection/api/1.1.0-alpha02.txt
index 084fe60..179d17f 100644
--- a/collection/api/1.1.0-alpha02.txt
+++ b/collection/api/1.1.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.collection {
 
   public class ArrayMap<K, V> extends androidx.collection.SimpleArrayMap<K,V> implements java.util.Map<K,V> {
diff --git a/collection/api/current.txt b/collection/api/current.txt
index 084fe60..179d17f 100644
--- a/collection/api/current.txt
+++ b/collection/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.collection {
 
   public class ArrayMap<K, V> extends androidx.collection.SimpleArrayMap<K,V> implements java.util.Map<K,V> {
diff --git a/collection/ktx/api/1.1.0-alpha02.txt b/collection/ktx/api/1.1.0-alpha02.txt
index 36ae63f..3fe6a36 100644
--- a/collection/ktx/api/1.1.0-alpha02.txt
+++ b/collection/ktx/api/1.1.0-alpha02.txt
@@ -1,50 +1,50 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.collection {
 
   public final class ArrayMapKt {
     ctor public ArrayMapKt();
-    method public static <K, V> androidx.collection.ArrayMap<K,V> arrayMapOf();
+    method public static inline <K, V> androidx.collection.ArrayMap<K,V> arrayMapOf();
     method public static <K, V> androidx.collection.ArrayMap<K,V> arrayMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
   }
 
   public final class ArraySetKt {
     ctor public ArraySetKt();
-    method public static <T> androidx.collection.ArraySet<T> arraySetOf();
+    method public static inline <T> androidx.collection.ArraySet<T> arraySetOf();
     method public static <T> androidx.collection.ArraySet<T> arraySetOf(T... values);
   }
 
   public final class LongSparseArrayKt {
     ctor public LongSparseArrayKt();
-    method public static operator <T> boolean contains(androidx.collection.LongSparseArray<T>, long key);
-    method public static <T> void forEach(androidx.collection.LongSparseArray<T>, kotlin.jvm.functions.Function2<? super java.lang.Long,? super T,kotlin.Unit> action);
-    method public static <T> T! getOrDefault(androidx.collection.LongSparseArray<T>, long key, T! defaultValue);
-    method public static <T> T! getOrElse(androidx.collection.LongSparseArray<T>, long key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
-    method public static <T> int getSize(androidx.collection.LongSparseArray<T>);
-    method public static <T> boolean isNotEmpty(androidx.collection.LongSparseArray<T>);
+    method public static inline operator <T> boolean contains(androidx.collection.LongSparseArray<T>, long key);
+    method public static inline <T> void forEach(androidx.collection.LongSparseArray<T>, kotlin.jvm.functions.Function2<? super java.lang.Long,? super T,kotlin.Unit> action);
+    method public static inline <T> T! getOrDefault(androidx.collection.LongSparseArray<T>, long key, T! defaultValue);
+    method public static inline <T> T! getOrElse(androidx.collection.LongSparseArray<T>, long key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method public static inline <T> int getSize(androidx.collection.LongSparseArray<T>);
+    method public static inline <T> boolean isNotEmpty(androidx.collection.LongSparseArray<T>);
     method public static <T> kotlin.collections.LongIterator keyIterator(androidx.collection.LongSparseArray<T>);
     method public static operator <T> androidx.collection.LongSparseArray<T> plus(androidx.collection.LongSparseArray<T>, androidx.collection.LongSparseArray<T> other);
     method @Deprecated public static <T> boolean remove(androidx.collection.LongSparseArray<T>, long key, T! value);
-    method public static operator <T> void set(androidx.collection.LongSparseArray<T>, long key, T! value);
+    method public static inline operator <T> void set(androidx.collection.LongSparseArray<T>, long key, T! value);
     method public static <T> java.util.Iterator<T> valueIterator(androidx.collection.LongSparseArray<T>);
   }
 
   public final class LruCacheKt {
     ctor public LruCacheKt();
-    method public static <K, V> androidx.collection.LruCache<K,V> lruCache(int maxSize, kotlin.jvm.functions.Function2<? super K,? super V,java.lang.Integer> sizeOf = { _, _ -> 1 }, kotlin.jvm.functions.Function1<? super K,? extends V> create = { (V)null }, kotlin.jvm.functions.Function4<? super java.lang.Boolean,? super K,? super V,? super V,kotlin.Unit> onEntryRemoved = { _, _, _, _ ->  });
+    method public static inline <K, V> androidx.collection.LruCache<K,V> lruCache(int maxSize, kotlin.jvm.functions.Function2<? super K,? super V,java.lang.Integer> sizeOf = { _, _ -> 1 }, kotlin.jvm.functions.Function1<? super K,? extends V> create = { (V)null }, kotlin.jvm.functions.Function4<? super java.lang.Boolean,? super K,? super V,? super V,kotlin.Unit> onEntryRemoved = { _, _, _, _ ->  });
   }
 
   public final class SparseArrayKt {
     ctor public SparseArrayKt();
-    method public static operator <T> boolean contains(androidx.collection.SparseArrayCompat<T>, int key);
-    method public static <T> void forEach(androidx.collection.SparseArrayCompat<T>, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> action);
-    method public static <T> T! getOrDefault(androidx.collection.SparseArrayCompat<T>, int key, T! defaultValue);
-    method public static <T> T! getOrElse(androidx.collection.SparseArrayCompat<T>, int key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
-    method public static <T> int getSize(androidx.collection.SparseArrayCompat<T>);
-    method public static <T> boolean isNotEmpty(androidx.collection.SparseArrayCompat<T>);
+    method public static inline operator <T> boolean contains(androidx.collection.SparseArrayCompat<T>, int key);
+    method public static inline <T> void forEach(androidx.collection.SparseArrayCompat<T>, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> action);
+    method public static inline <T> T! getOrDefault(androidx.collection.SparseArrayCompat<T>, int key, T! defaultValue);
+    method public static inline <T> T! getOrElse(androidx.collection.SparseArrayCompat<T>, int key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method public static inline <T> int getSize(androidx.collection.SparseArrayCompat<T>);
+    method public static inline <T> boolean isNotEmpty(androidx.collection.SparseArrayCompat<T>);
     method public static <T> kotlin.collections.IntIterator keyIterator(androidx.collection.SparseArrayCompat<T>);
     method public static operator <T> androidx.collection.SparseArrayCompat<T> plus(androidx.collection.SparseArrayCompat<T>, androidx.collection.SparseArrayCompat<T> other);
     method @Deprecated public static <T> boolean remove(androidx.collection.SparseArrayCompat<T>, int key, T! value);
-    method public static operator <T> void set(androidx.collection.SparseArrayCompat<T>, int key, T! value);
+    method public static inline operator <T> void set(androidx.collection.SparseArrayCompat<T>, int key, T! value);
     method public static <T> java.util.Iterator<T> valueIterator(androidx.collection.SparseArrayCompat<T>);
   }
 
diff --git a/collection/ktx/api/current.txt b/collection/ktx/api/current.txt
index 36ae63f..3fe6a36 100644
--- a/collection/ktx/api/current.txt
+++ b/collection/ktx/api/current.txt
@@ -1,50 +1,50 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.collection {
 
   public final class ArrayMapKt {
     ctor public ArrayMapKt();
-    method public static <K, V> androidx.collection.ArrayMap<K,V> arrayMapOf();
+    method public static inline <K, V> androidx.collection.ArrayMap<K,V> arrayMapOf();
     method public static <K, V> androidx.collection.ArrayMap<K,V> arrayMapOf(kotlin.Pair<? extends K,? extends V>... pairs);
   }
 
   public final class ArraySetKt {
     ctor public ArraySetKt();
-    method public static <T> androidx.collection.ArraySet<T> arraySetOf();
+    method public static inline <T> androidx.collection.ArraySet<T> arraySetOf();
     method public static <T> androidx.collection.ArraySet<T> arraySetOf(T... values);
   }
 
   public final class LongSparseArrayKt {
     ctor public LongSparseArrayKt();
-    method public static operator <T> boolean contains(androidx.collection.LongSparseArray<T>, long key);
-    method public static <T> void forEach(androidx.collection.LongSparseArray<T>, kotlin.jvm.functions.Function2<? super java.lang.Long,? super T,kotlin.Unit> action);
-    method public static <T> T! getOrDefault(androidx.collection.LongSparseArray<T>, long key, T! defaultValue);
-    method public static <T> T! getOrElse(androidx.collection.LongSparseArray<T>, long key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
-    method public static <T> int getSize(androidx.collection.LongSparseArray<T>);
-    method public static <T> boolean isNotEmpty(androidx.collection.LongSparseArray<T>);
+    method public static inline operator <T> boolean contains(androidx.collection.LongSparseArray<T>, long key);
+    method public static inline <T> void forEach(androidx.collection.LongSparseArray<T>, kotlin.jvm.functions.Function2<? super java.lang.Long,? super T,kotlin.Unit> action);
+    method public static inline <T> T! getOrDefault(androidx.collection.LongSparseArray<T>, long key, T! defaultValue);
+    method public static inline <T> T! getOrElse(androidx.collection.LongSparseArray<T>, long key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method public static inline <T> int getSize(androidx.collection.LongSparseArray<T>);
+    method public static inline <T> boolean isNotEmpty(androidx.collection.LongSparseArray<T>);
     method public static <T> kotlin.collections.LongIterator keyIterator(androidx.collection.LongSparseArray<T>);
     method public static operator <T> androidx.collection.LongSparseArray<T> plus(androidx.collection.LongSparseArray<T>, androidx.collection.LongSparseArray<T> other);
     method @Deprecated public static <T> boolean remove(androidx.collection.LongSparseArray<T>, long key, T! value);
-    method public static operator <T> void set(androidx.collection.LongSparseArray<T>, long key, T! value);
+    method public static inline operator <T> void set(androidx.collection.LongSparseArray<T>, long key, T! value);
     method public static <T> java.util.Iterator<T> valueIterator(androidx.collection.LongSparseArray<T>);
   }
 
   public final class LruCacheKt {
     ctor public LruCacheKt();
-    method public static <K, V> androidx.collection.LruCache<K,V> lruCache(int maxSize, kotlin.jvm.functions.Function2<? super K,? super V,java.lang.Integer> sizeOf = { _, _ -> 1 }, kotlin.jvm.functions.Function1<? super K,? extends V> create = { (V)null }, kotlin.jvm.functions.Function4<? super java.lang.Boolean,? super K,? super V,? super V,kotlin.Unit> onEntryRemoved = { _, _, _, _ ->  });
+    method public static inline <K, V> androidx.collection.LruCache<K,V> lruCache(int maxSize, kotlin.jvm.functions.Function2<? super K,? super V,java.lang.Integer> sizeOf = { _, _ -> 1 }, kotlin.jvm.functions.Function1<? super K,? extends V> create = { (V)null }, kotlin.jvm.functions.Function4<? super java.lang.Boolean,? super K,? super V,? super V,kotlin.Unit> onEntryRemoved = { _, _, _, _ ->  });
   }
 
   public final class SparseArrayKt {
     ctor public SparseArrayKt();
-    method public static operator <T> boolean contains(androidx.collection.SparseArrayCompat<T>, int key);
-    method public static <T> void forEach(androidx.collection.SparseArrayCompat<T>, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> action);
-    method public static <T> T! getOrDefault(androidx.collection.SparseArrayCompat<T>, int key, T! defaultValue);
-    method public static <T> T! getOrElse(androidx.collection.SparseArrayCompat<T>, int key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
-    method public static <T> int getSize(androidx.collection.SparseArrayCompat<T>);
-    method public static <T> boolean isNotEmpty(androidx.collection.SparseArrayCompat<T>);
+    method public static inline operator <T> boolean contains(androidx.collection.SparseArrayCompat<T>, int key);
+    method public static inline <T> void forEach(androidx.collection.SparseArrayCompat<T>, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> action);
+    method public static inline <T> T! getOrDefault(androidx.collection.SparseArrayCompat<T>, int key, T! defaultValue);
+    method public static inline <T> T! getOrElse(androidx.collection.SparseArrayCompat<T>, int key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method public static inline <T> int getSize(androidx.collection.SparseArrayCompat<T>);
+    method public static inline <T> boolean isNotEmpty(androidx.collection.SparseArrayCompat<T>);
     method public static <T> kotlin.collections.IntIterator keyIterator(androidx.collection.SparseArrayCompat<T>);
     method public static operator <T> androidx.collection.SparseArrayCompat<T> plus(androidx.collection.SparseArrayCompat<T>, androidx.collection.SparseArrayCompat<T> other);
     method @Deprecated public static <T> boolean remove(androidx.collection.SparseArrayCompat<T>, int key, T! value);
-    method public static operator <T> void set(androidx.collection.SparseArrayCompat<T>, int key, T! value);
+    method public static inline operator <T> void set(androidx.collection.SparseArrayCompat<T>, int key, T! value);
     method public static <T> java.util.Iterator<T> valueIterator(androidx.collection.SparseArrayCompat<T>);
   }
 
diff --git a/concurrent/futures/api/1.0.0-alpha03.txt b/concurrent/futures/api/1.0.0-alpha03.txt
index 16dc099..f187a1b 100644
--- a/concurrent/futures/api/1.0.0-alpha03.txt
+++ b/concurrent/futures/api/1.0.0-alpha03.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.concurrent.futures {
 
   public abstract class AbstractResolvableFuture<V> implements com.google.common.util.concurrent.ListenableFuture<V> {
diff --git a/concurrent/futures/api/current.txt b/concurrent/futures/api/current.txt
index 16dc099..f187a1b 100644
--- a/concurrent/futures/api/current.txt
+++ b/concurrent/futures/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.concurrent.futures {
 
   public abstract class AbstractResolvableFuture<V> implements com.google.common.util.concurrent.ListenableFuture<V> {
diff --git a/content/api/1.0.0.txt b/content/api/1.0.0.txt
index d57af6b..b5241ef 100644
--- a/content/api/1.0.0.txt
+++ b/content/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.contentpager.content {
 
   public class ContentPager {
diff --git a/content/api/current.txt b/content/api/current.txt
index d57af6b..b5241ef 100644
--- a/content/api/current.txt
+++ b/content/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.contentpager.content {
 
   public class ContentPager {
diff --git a/coordinatorlayout/api/1.1.0-alpha02.txt b/coordinatorlayout/api/1.1.0-alpha02.txt
index b4b3d63..06dd4b4 100644
--- a/coordinatorlayout/api/1.1.0-alpha02.txt
+++ b/coordinatorlayout/api/1.1.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.coordinatorlayout.widget {
 
   public class CoordinatorLayout extends android.view.ViewGroup implements androidx.core.view.NestedScrollingParent2 androidx.core.view.NestedScrollingParent3 {
diff --git a/coordinatorlayout/api/current.txt b/coordinatorlayout/api/current.txt
index b4b3d63..06dd4b4 100644
--- a/coordinatorlayout/api/current.txt
+++ b/coordinatorlayout/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.coordinatorlayout.widget {
 
   public class CoordinatorLayout extends android.view.ViewGroup implements androidx.core.view.NestedScrollingParent2 androidx.core.view.NestedScrollingParent3 {
diff --git a/core/api/1.1.0-alpha04.txt b/core/api/1.1.0-alpha04.txt
index 9a55963..28179f8 100644
--- a/core/api/1.1.0-alpha04.txt
+++ b/core/api/1.1.0-alpha04.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.core.accessibilityservice {
 
   public final class AccessibilityServiceInfoCompat {
diff --git a/core/api/current.txt b/core/api/current.txt
index 9a55963..28179f8 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.core.accessibilityservice {
 
   public final class AccessibilityServiceInfoCompat {
diff --git a/core/ktx/api/1.1.0-alpha04.txt b/core/ktx/api/1.1.0-alpha04.txt
index 6813932..63739d2 100644
--- a/core/ktx/api/1.1.0-alpha04.txt
+++ b/core/ktx/api/1.1.0-alpha04.txt
@@ -1,16 +1,16 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.core.animation {
 
   public final class AnimatorKt {
     ctor public AnimatorKt();
-    method public static android.animation.Animator.AnimatorListener addListener(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onEnd = {}, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onStart = {}, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onCancel = {}, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onRepeat = {});
-    method @RequiresApi(19) public static android.animation.Animator.AnimatorPauseListener addPauseListener(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onResume = {}, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onPause = {});
-    method public static android.animation.Animator.AnimatorListener doOnCancel(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
-    method public static android.animation.Animator.AnimatorListener doOnEnd(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
-    method @RequiresApi(19) public static android.animation.Animator.AnimatorPauseListener doOnPause(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
-    method public static android.animation.Animator.AnimatorListener doOnRepeat(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
-    method @RequiresApi(19) public static android.animation.Animator.AnimatorPauseListener doOnResume(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
-    method public static android.animation.Animator.AnimatorListener doOnStart(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
+    method public static inline android.animation.Animator.AnimatorListener addListener(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onEnd = {}, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onStart = {}, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onCancel = {}, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onRepeat = {});
+    method @RequiresApi(19) public static inline android.animation.Animator.AnimatorPauseListener addPauseListener(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onResume = {}, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onPause = {});
+    method public static inline android.animation.Animator.AnimatorListener doOnCancel(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
+    method public static inline android.animation.Animator.AnimatorListener doOnEnd(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
+    method @RequiresApi(19) public static inline android.animation.Animator.AnimatorPauseListener doOnPause(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
+    method public static inline android.animation.Animator.AnimatorListener doOnRepeat(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
+    method @RequiresApi(19) public static inline android.animation.Animator.AnimatorPauseListener doOnResume(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
+    method public static inline android.animation.Animator.AnimatorListener doOnStart(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
   }
 
 }
@@ -24,13 +24,14 @@
 
   public final class ContextKt {
     ctor public ContextKt();
-    method public static void withStyledAttributes(android.content.Context, android.util.AttributeSet? set = null, int[] attrs, @AttrRes int defStyleAttr = 0, @StyleRes int defStyleRes = 0, kotlin.jvm.functions.Function1<? super android.content.res.TypedArray,kotlin.Unit> block);
-    method public static void withStyledAttributes(android.content.Context, @StyleRes int resourceId, int[] attrs, kotlin.jvm.functions.Function1<? super android.content.res.TypedArray,kotlin.Unit> block);
+    method public static inline <reified T> T! getSystemService(android.content.Context);
+    method public static inline void withStyledAttributes(android.content.Context, android.util.AttributeSet? set = null, int[] attrs, @AttrRes int defStyleAttr = 0, @StyleRes int defStyleRes = 0, kotlin.jvm.functions.Function1<? super android.content.res.TypedArray,kotlin.Unit> block);
+    method public static inline void withStyledAttributes(android.content.Context, @StyleRes int resourceId, int[] attrs, kotlin.jvm.functions.Function1<? super android.content.res.TypedArray,kotlin.Unit> block);
   }
 
   public final class SharedPreferencesKt {
     ctor public SharedPreferencesKt();
-    method public static void edit(android.content.SharedPreferences, boolean commit = false, kotlin.jvm.functions.Function1<? super android.content.SharedPreferences.Editor,kotlin.Unit> action);
+    method public static inline void edit(android.content.SharedPreferences, boolean commit = false, kotlin.jvm.functions.Function1<? super android.content.SharedPreferences.Editor,kotlin.Unit> action);
   }
 
 }
@@ -54,7 +55,7 @@
     method public static String getStringOrThrow(android.content.res.TypedArray, @StyleableRes int index);
     method public static CharSequence[] getTextArrayOrThrow(android.content.res.TypedArray, @StyleableRes int index);
     method public static CharSequence getTextOrThrow(android.content.res.TypedArray, @StyleableRes int index);
-    method public static <R> R! use(android.content.res.TypedArray, kotlin.jvm.functions.Function1<? super android.content.res.TypedArray,? extends R> block);
+    method public static inline <R> R! use(android.content.res.TypedArray, kotlin.jvm.functions.Function1<? super android.content.res.TypedArray,? extends R> block);
   }
 
 }
@@ -63,13 +64,13 @@
 
   public final class CursorKt {
     ctor public CursorKt();
-    method public static byte[]? getBlobOrNull(android.database.Cursor, int index);
-    method public static Double? getDoubleOrNull(android.database.Cursor, int index);
-    method public static Float? getFloatOrNull(android.database.Cursor, int index);
-    method public static Integer? getIntOrNull(android.database.Cursor, int index);
-    method public static Long? getLongOrNull(android.database.Cursor, int index);
-    method public static Short? getShortOrNull(android.database.Cursor, int index);
-    method public static String? getStringOrNull(android.database.Cursor, int index);
+    method public static inline byte[]? getBlobOrNull(android.database.Cursor, int index);
+    method public static inline Double? getDoubleOrNull(android.database.Cursor, int index);
+    method public static inline Float? getFloatOrNull(android.database.Cursor, int index);
+    method public static inline Integer? getIntOrNull(android.database.Cursor, int index);
+    method public static inline Long? getLongOrNull(android.database.Cursor, int index);
+    method public static inline Short? getShortOrNull(android.database.Cursor, int index);
+    method public static inline String? getStringOrNull(android.database.Cursor, int index);
   }
 
 }
@@ -78,7 +79,7 @@
 
   public final class SQLiteDatabaseKt {
     ctor public SQLiteDatabaseKt();
-    method public static <T> T! transaction(android.database.sqlite.SQLiteDatabase, boolean exclusive = true, kotlin.jvm.functions.Function1<? super android.database.sqlite.SQLiteDatabase,? extends T> body);
+    method public static inline <T> T! transaction(android.database.sqlite.SQLiteDatabase, boolean exclusive = true, kotlin.jvm.functions.Function1<? super android.database.sqlite.SQLiteDatabase,? extends T> body);
   }
 
 }
@@ -87,187 +88,187 @@
 
   public final class BitmapKt {
     ctor public BitmapKt();
-    method public static android.graphics.Bitmap applyCanvas(android.graphics.Bitmap, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static operator boolean contains(android.graphics.Bitmap, android.graphics.Point p);
-    method public static operator boolean contains(android.graphics.Bitmap, android.graphics.PointF p);
-    method public static android.graphics.Bitmap createBitmap(int width, int height, android.graphics.Bitmap.Config config = android.graphics.Bitmap.Config.ARGB_8888);
-    method @RequiresApi(26) public static android.graphics.Bitmap createBitmap(int width, int height, android.graphics.Bitmap.Config config = android.graphics.Bitmap.Config.ARGB_8888, boolean hasAlpha = true, android.graphics.ColorSpace colorSpace = ColorSpace.get(ColorSpace.Named.SRGB));
-    method public static operator int get(android.graphics.Bitmap, int x, int y);
-    method public static android.graphics.Bitmap scale(android.graphics.Bitmap, int width, int height, boolean filter = true);
-    method public static operator void set(android.graphics.Bitmap, int x, int y, @ColorInt int color);
+    method public static inline android.graphics.Bitmap applyCanvas(android.graphics.Bitmap, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline operator boolean contains(android.graphics.Bitmap, android.graphics.Point p);
+    method public static inline operator boolean contains(android.graphics.Bitmap, android.graphics.PointF p);
+    method public static inline android.graphics.Bitmap createBitmap(int width, int height, android.graphics.Bitmap.Config config = android.graphics.Bitmap.Config.ARGB_8888);
+    method @RequiresApi(26) public static inline android.graphics.Bitmap createBitmap(int width, int height, android.graphics.Bitmap.Config config = android.graphics.Bitmap.Config.ARGB_8888, boolean hasAlpha = true, android.graphics.ColorSpace colorSpace = ColorSpace.get(ColorSpace.Named.SRGB));
+    method public static inline operator int get(android.graphics.Bitmap, int x, int y);
+    method public static inline android.graphics.Bitmap scale(android.graphics.Bitmap, int width, int height, boolean filter = true);
+    method public static inline operator void set(android.graphics.Bitmap, int x, int y, @ColorInt int color);
   }
 
   public final class CanvasKt {
     ctor public CanvasKt();
-    method public static void withClip(android.graphics.Canvas, android.graphics.Rect clipRect, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withClip(android.graphics.Canvas, android.graphics.RectF clipRect, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withClip(android.graphics.Canvas, int left, int top, int right, int bottom, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withClip(android.graphics.Canvas, float left, float top, float right, float bottom, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withClip(android.graphics.Canvas, android.graphics.Path clipPath, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withMatrix(android.graphics.Canvas, android.graphics.Matrix matrix = android.graphics.Matrix(), kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withRotation(android.graphics.Canvas, float degrees = 0.0f, float pivotX = 0.0f, float pivotY = 0.0f, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withSave(android.graphics.Canvas, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withScale(android.graphics.Canvas, float x = 1.0f, float y = 1.0f, float pivotX = 0.0f, float pivotY = 0.0f, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withSkew(android.graphics.Canvas, float x = 0.0f, float y = 0.0f, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withTranslation(android.graphics.Canvas, float x = 0.0f, float y = 0.0f, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withClip(android.graphics.Canvas, android.graphics.Rect clipRect, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withClip(android.graphics.Canvas, android.graphics.RectF clipRect, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withClip(android.graphics.Canvas, int left, int top, int right, int bottom, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withClip(android.graphics.Canvas, float left, float top, float right, float bottom, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withClip(android.graphics.Canvas, android.graphics.Path clipPath, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withMatrix(android.graphics.Canvas, android.graphics.Matrix matrix = android.graphics.Matrix(), kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withRotation(android.graphics.Canvas, float degrees = 0.0f, float pivotX = 0.0f, float pivotY = 0.0f, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withSave(android.graphics.Canvas, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withScale(android.graphics.Canvas, float x = 1.0f, float y = 1.0f, float pivotX = 0.0f, float pivotY = 0.0f, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withSkew(android.graphics.Canvas, float x = 0.0f, float y = 0.0f, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withTranslation(android.graphics.Canvas, float x = 0.0f, float y = 0.0f, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
   }
 
   public final class ColorKt {
     ctor public ColorKt();
-    method @RequiresApi(26) public static operator float component1(android.graphics.Color);
-    method public static operator int component1(int);
-    method @RequiresApi(26) public static operator float component1(long);
-    method @RequiresApi(26) public static operator float component2(android.graphics.Color);
-    method public static operator int component2(int);
-    method @RequiresApi(26) public static operator float component2(long);
-    method @RequiresApi(26) public static operator float component3(android.graphics.Color);
-    method public static operator int component3(int);
-    method @RequiresApi(26) public static operator float component3(long);
-    method @RequiresApi(26) public static operator float component4(android.graphics.Color);
-    method public static operator int component4(int);
-    method @RequiresApi(26) public static operator float component4(long);
-    method @RequiresApi(26) @ColorLong public static infix long convertTo(int, android.graphics.ColorSpace.Named colorSpace);
-    method @RequiresApi(26) @ColorLong public static infix long convertTo(int, android.graphics.ColorSpace colorSpace);
-    method @RequiresApi(26) @ColorLong public static infix long convertTo(long, android.graphics.ColorSpace.Named colorSpace);
-    method @RequiresApi(26) @ColorLong public static infix long convertTo(long, android.graphics.ColorSpace colorSpace);
-    method @RequiresApi(26) public static infix android.graphics.Color! convertTo(android.graphics.Color, android.graphics.ColorSpace.Named colorSpace);
-    method @RequiresApi(26) public static infix android.graphics.Color! convertTo(android.graphics.Color, android.graphics.ColorSpace colorSpace);
-    method public static int getAlpha(int);
-    method @RequiresApi(26) public static float getAlpha(long);
-    method public static int getBlue(int);
-    method @RequiresApi(26) public static float getBlue(long);
-    method @RequiresApi(26) public static android.graphics.ColorSpace getColorSpace(long);
-    method public static int getGreen(int);
-    method @RequiresApi(26) public static float getGreen(long);
-    method @RequiresApi(26) public static float getLuminance(int);
-    method @RequiresApi(26) public static float getLuminance(long);
-    method public static int getRed(int);
-    method @RequiresApi(26) public static float getRed(long);
-    method @RequiresApi(26) public static boolean isSrgb(long);
-    method @RequiresApi(26) public static boolean isWideGamut(long);
+    method @RequiresApi(26) public static inline operator float component1(android.graphics.Color);
+    method public static inline operator int component1(int);
+    method @RequiresApi(26) public static inline operator float component1(long);
+    method @RequiresApi(26) public static inline operator float component2(android.graphics.Color);
+    method public static inline operator int component2(int);
+    method @RequiresApi(26) public static inline operator float component2(long);
+    method @RequiresApi(26) public static inline operator float component3(android.graphics.Color);
+    method public static inline operator int component3(int);
+    method @RequiresApi(26) public static inline operator float component3(long);
+    method @RequiresApi(26) public static inline operator float component4(android.graphics.Color);
+    method public static inline operator int component4(int);
+    method @RequiresApi(26) public static inline operator float component4(long);
+    method @ColorLong @RequiresApi(26) public static inline infix long convertTo(int, android.graphics.ColorSpace.Named colorSpace);
+    method @ColorLong @RequiresApi(26) public static inline infix long convertTo(int, android.graphics.ColorSpace colorSpace);
+    method @ColorLong @RequiresApi(26) public static inline infix long convertTo(long, android.graphics.ColorSpace.Named colorSpace);
+    method @ColorLong @RequiresApi(26) public static inline infix long convertTo(long, android.graphics.ColorSpace colorSpace);
+    method @RequiresApi(26) public static inline infix android.graphics.Color! convertTo(android.graphics.Color, android.graphics.ColorSpace.Named colorSpace);
+    method @RequiresApi(26) public static inline infix android.graphics.Color! convertTo(android.graphics.Color, android.graphics.ColorSpace colorSpace);
+    method public static inline int getAlpha(int);
+    method @RequiresApi(26) public static inline float getAlpha(long);
+    method public static inline int getBlue(int);
+    method @RequiresApi(26) public static inline float getBlue(long);
+    method @RequiresApi(26) public static inline android.graphics.ColorSpace getColorSpace(long);
+    method public static inline int getGreen(int);
+    method @RequiresApi(26) public static inline float getGreen(long);
+    method @RequiresApi(26) public static inline float getLuminance(int);
+    method @RequiresApi(26) public static inline float getLuminance(long);
+    method public static inline int getRed(int);
+    method @RequiresApi(26) public static inline float getRed(long);
+    method @RequiresApi(26) public static inline boolean isSrgb(long);
+    method @RequiresApi(26) public static inline boolean isWideGamut(long);
     method @RequiresApi(26) public static operator android.graphics.Color plus(android.graphics.Color, android.graphics.Color c);
-    method @RequiresApi(26) public static android.graphics.Color toColor(int);
-    method @RequiresApi(26) public static android.graphics.Color toColor(long);
-    method @RequiresApi(26) @ColorInt public static int toColorInt(long);
-    method @ColorInt public static int toColorInt(String);
-    method @RequiresApi(26) @ColorLong public static long toColorLong(int);
+    method @RequiresApi(26) public static inline android.graphics.Color toColor(int);
+    method @RequiresApi(26) public static inline android.graphics.Color toColor(long);
+    method @ColorInt @RequiresApi(26) public static inline int toColorInt(long);
+    method @ColorInt public static inline int toColorInt(String);
+    method @ColorLong @RequiresApi(26) public static inline long toColorLong(int);
   }
 
   public final class ImageDecoderKt {
     ctor public ImageDecoderKt();
-    method @RequiresApi(28) public static android.graphics.Bitmap decodeBitmap(android.graphics.ImageDecoder.Source, kotlin.jvm.functions.Function3<? super android.graphics.ImageDecoder,? super android.graphics.ImageDecoder.ImageInfo,? super android.graphics.ImageDecoder.Source,kotlin.Unit> action);
-    method @RequiresApi(28) public static android.graphics.drawable.Drawable decodeDrawable(android.graphics.ImageDecoder.Source, kotlin.jvm.functions.Function3<? super android.graphics.ImageDecoder,? super android.graphics.ImageDecoder.ImageInfo,? super android.graphics.ImageDecoder.Source,kotlin.Unit> action);
+    method @RequiresApi(28) public static inline android.graphics.Bitmap decodeBitmap(android.graphics.ImageDecoder.Source, kotlin.jvm.functions.Function3<? super android.graphics.ImageDecoder,? super android.graphics.ImageDecoder.ImageInfo,? super android.graphics.ImageDecoder.Source,kotlin.Unit> action);
+    method @RequiresApi(28) public static inline android.graphics.drawable.Drawable decodeDrawable(android.graphics.ImageDecoder.Source, kotlin.jvm.functions.Function3<? super android.graphics.ImageDecoder,? super android.graphics.ImageDecoder.ImageInfo,? super android.graphics.ImageDecoder.Source,kotlin.Unit> action);
   }
 
   public final class MatrixKt {
     ctor public MatrixKt();
     method public static android.graphics.Matrix rotationMatrix(float degrees, float px = 0.0f, float py = 0.0f);
     method public static android.graphics.Matrix scaleMatrix(float sx = 1.0f, float sy = 1.0f);
-    method public static operator android.graphics.Matrix times(android.graphics.Matrix, android.graphics.Matrix m);
+    method public static inline operator android.graphics.Matrix times(android.graphics.Matrix, android.graphics.Matrix m);
     method public static android.graphics.Matrix translationMatrix(float tx = 0.0f, float ty = 0.0f);
-    method public static float[] values(android.graphics.Matrix);
+    method public static inline float[] values(android.graphics.Matrix);
   }
 
   public final class PathKt {
     ctor public PathKt();
-    method @RequiresApi(19) public static infix android.graphics.Path and(android.graphics.Path, android.graphics.Path p);
+    method @RequiresApi(19) public static inline infix android.graphics.Path and(android.graphics.Path, android.graphics.Path p);
     method @RequiresApi(26) public static Iterable<androidx.core.graphics.PathSegment> flatten(android.graphics.Path, float error = 0.5f);
-    method @RequiresApi(19) public static operator android.graphics.Path minus(android.graphics.Path, android.graphics.Path p);
-    method @RequiresApi(19) public static infix android.graphics.Path or(android.graphics.Path, android.graphics.Path p);
-    method @RequiresApi(19) public static operator android.graphics.Path plus(android.graphics.Path, android.graphics.Path p);
-    method @RequiresApi(19) public static infix android.graphics.Path xor(android.graphics.Path, android.graphics.Path p);
+    method @RequiresApi(19) public static inline operator android.graphics.Path minus(android.graphics.Path, android.graphics.Path p);
+    method @RequiresApi(19) public static inline infix android.graphics.Path or(android.graphics.Path, android.graphics.Path p);
+    method @RequiresApi(19) public static inline operator android.graphics.Path plus(android.graphics.Path, android.graphics.Path p);
+    method @RequiresApi(19) public static inline infix android.graphics.Path xor(android.graphics.Path, android.graphics.Path p);
   }
 
   public final class PictureKt {
     ctor public PictureKt();
-    method public static android.graphics.Picture record(android.graphics.Picture, int width, int height, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline android.graphics.Picture record(android.graphics.Picture, int width, int height, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
   }
 
   public final class PointKt {
     ctor public PointKt();
-    method public static operator int component1(android.graphics.Point);
-    method public static operator float component1(android.graphics.PointF);
-    method public static operator int component2(android.graphics.Point);
-    method public static operator float component2(android.graphics.PointF);
-    method public static operator android.graphics.Point minus(android.graphics.Point, android.graphics.Point p);
-    method public static operator android.graphics.PointF minus(android.graphics.PointF, android.graphics.PointF p);
-    method public static operator android.graphics.Point minus(android.graphics.Point, int xy);
-    method public static operator android.graphics.PointF minus(android.graphics.PointF, float xy);
-    method public static operator android.graphics.Point plus(android.graphics.Point, android.graphics.Point p);
-    method public static operator android.graphics.PointF plus(android.graphics.PointF, android.graphics.PointF p);
-    method public static operator android.graphics.Point plus(android.graphics.Point, int xy);
-    method public static operator android.graphics.PointF plus(android.graphics.PointF, float xy);
-    method public static android.graphics.Point toPoint(android.graphics.PointF);
-    method public static android.graphics.PointF toPointF(android.graphics.Point);
-    method public static operator android.graphics.Point unaryMinus(android.graphics.Point);
-    method public static operator android.graphics.PointF unaryMinus(android.graphics.PointF);
+    method public static inline operator int component1(android.graphics.Point);
+    method public static inline operator float component1(android.graphics.PointF);
+    method public static inline operator int component2(android.graphics.Point);
+    method public static inline operator float component2(android.graphics.PointF);
+    method public static inline operator android.graphics.Point minus(android.graphics.Point, android.graphics.Point p);
+    method public static inline operator android.graphics.PointF minus(android.graphics.PointF, android.graphics.PointF p);
+    method public static inline operator android.graphics.Point minus(android.graphics.Point, int xy);
+    method public static inline operator android.graphics.PointF minus(android.graphics.PointF, float xy);
+    method public static inline operator android.graphics.Point plus(android.graphics.Point, android.graphics.Point p);
+    method public static inline operator android.graphics.PointF plus(android.graphics.PointF, android.graphics.PointF p);
+    method public static inline operator android.graphics.Point plus(android.graphics.Point, int xy);
+    method public static inline operator android.graphics.PointF plus(android.graphics.PointF, float xy);
+    method public static inline android.graphics.Point toPoint(android.graphics.PointF);
+    method public static inline android.graphics.PointF toPointF(android.graphics.Point);
+    method public static inline operator android.graphics.Point unaryMinus(android.graphics.Point);
+    method public static inline operator android.graphics.PointF unaryMinus(android.graphics.PointF);
   }
 
   public final class PorterDuffKt {
     ctor public PorterDuffKt();
-    method public static android.graphics.PorterDuffColorFilter toColorFilter(android.graphics.PorterDuff.Mode, int color);
-    method public static android.graphics.PorterDuffXfermode toXfermode(android.graphics.PorterDuff.Mode);
+    method public static inline android.graphics.PorterDuffColorFilter toColorFilter(android.graphics.PorterDuff.Mode, int color);
+    method public static inline android.graphics.PorterDuffXfermode toXfermode(android.graphics.PorterDuff.Mode);
   }
 
   public final class RectKt {
     ctor public RectKt();
-    method public static infix android.graphics.Rect and(android.graphics.Rect, android.graphics.Rect r);
-    method public static infix android.graphics.RectF and(android.graphics.RectF, android.graphics.RectF r);
-    method public static operator int component1(android.graphics.Rect);
-    method public static operator float component1(android.graphics.RectF);
-    method public static operator int component2(android.graphics.Rect);
-    method public static operator float component2(android.graphics.RectF);
-    method public static operator int component3(android.graphics.Rect);
-    method public static operator float component3(android.graphics.RectF);
-    method public static operator int component4(android.graphics.Rect);
-    method public static operator float component4(android.graphics.RectF);
-    method public static operator boolean contains(android.graphics.Rect, android.graphics.Point p);
-    method public static operator boolean contains(android.graphics.RectF, android.graphics.PointF p);
-    method public static operator android.graphics.Region minus(android.graphics.Rect, android.graphics.Rect r);
-    method public static operator android.graphics.Region minus(android.graphics.RectF, android.graphics.RectF r);
-    method public static operator android.graphics.Rect minus(android.graphics.Rect, int xy);
-    method public static operator android.graphics.RectF minus(android.graphics.RectF, float xy);
-    method public static operator android.graphics.Rect minus(android.graphics.Rect, android.graphics.Point xy);
-    method public static operator android.graphics.RectF minus(android.graphics.RectF, android.graphics.PointF xy);
-    method public static infix android.graphics.Rect or(android.graphics.Rect, android.graphics.Rect r);
-    method public static infix android.graphics.RectF or(android.graphics.RectF, android.graphics.RectF r);
-    method public static operator android.graphics.Rect plus(android.graphics.Rect, android.graphics.Rect r);
-    method public static operator android.graphics.RectF plus(android.graphics.RectF, android.graphics.RectF r);
-    method public static operator android.graphics.Rect plus(android.graphics.Rect, int xy);
-    method public static operator android.graphics.RectF plus(android.graphics.RectF, float xy);
-    method public static operator android.graphics.Rect plus(android.graphics.Rect, android.graphics.Point xy);
-    method public static operator android.graphics.RectF plus(android.graphics.RectF, android.graphics.PointF xy);
-    method public static android.graphics.Rect toRect(android.graphics.RectF);
-    method public static android.graphics.RectF toRectF(android.graphics.Rect);
-    method public static android.graphics.Region toRegion(android.graphics.Rect);
-    method public static android.graphics.Region toRegion(android.graphics.RectF);
-    method public static android.graphics.RectF transform(android.graphics.RectF, android.graphics.Matrix m);
-    method public static infix android.graphics.Region xor(android.graphics.Rect, android.graphics.Rect r);
-    method public static infix android.graphics.Region xor(android.graphics.RectF, android.graphics.RectF r);
+    method public static inline infix android.graphics.Rect and(android.graphics.Rect, android.graphics.Rect r);
+    method public static inline infix android.graphics.RectF and(android.graphics.RectF, android.graphics.RectF r);
+    method public static inline operator int component1(android.graphics.Rect);
+    method public static inline operator float component1(android.graphics.RectF);
+    method public static inline operator int component2(android.graphics.Rect);
+    method public static inline operator float component2(android.graphics.RectF);
+    method public static inline operator int component3(android.graphics.Rect);
+    method public static inline operator float component3(android.graphics.RectF);
+    method public static inline operator int component4(android.graphics.Rect);
+    method public static inline operator float component4(android.graphics.RectF);
+    method public static inline operator boolean contains(android.graphics.Rect, android.graphics.Point p);
+    method public static inline operator boolean contains(android.graphics.RectF, android.graphics.PointF p);
+    method public static inline operator android.graphics.Region minus(android.graphics.Rect, android.graphics.Rect r);
+    method public static inline operator android.graphics.Region minus(android.graphics.RectF, android.graphics.RectF r);
+    method public static inline operator android.graphics.Rect minus(android.graphics.Rect, int xy);
+    method public static inline operator android.graphics.RectF minus(android.graphics.RectF, float xy);
+    method public static inline operator android.graphics.Rect minus(android.graphics.Rect, android.graphics.Point xy);
+    method public static inline operator android.graphics.RectF minus(android.graphics.RectF, android.graphics.PointF xy);
+    method public static inline infix android.graphics.Rect or(android.graphics.Rect, android.graphics.Rect r);
+    method public static inline infix android.graphics.RectF or(android.graphics.RectF, android.graphics.RectF r);
+    method public static inline operator android.graphics.Rect plus(android.graphics.Rect, android.graphics.Rect r);
+    method public static inline operator android.graphics.RectF plus(android.graphics.RectF, android.graphics.RectF r);
+    method public static inline operator android.graphics.Rect plus(android.graphics.Rect, int xy);
+    method public static inline operator android.graphics.RectF plus(android.graphics.RectF, float xy);
+    method public static inline operator android.graphics.Rect plus(android.graphics.Rect, android.graphics.Point xy);
+    method public static inline operator android.graphics.RectF plus(android.graphics.RectF, android.graphics.PointF xy);
+    method public static inline android.graphics.Rect toRect(android.graphics.RectF);
+    method public static inline android.graphics.RectF toRectF(android.graphics.Rect);
+    method public static inline android.graphics.Region toRegion(android.graphics.Rect);
+    method public static inline android.graphics.Region toRegion(android.graphics.RectF);
+    method public static inline android.graphics.RectF transform(android.graphics.RectF, android.graphics.Matrix m);
+    method public static inline infix android.graphics.Region xor(android.graphics.Rect, android.graphics.Rect r);
+    method public static inline infix android.graphics.Region xor(android.graphics.RectF, android.graphics.RectF r);
   }
 
   public final class RegionKt {
     ctor public RegionKt();
-    method public static infix android.graphics.Region and(android.graphics.Region, android.graphics.Rect r);
-    method public static infix android.graphics.Region and(android.graphics.Region, android.graphics.Region r);
-    method public static operator boolean contains(android.graphics.Region, android.graphics.Point p);
-    method public static void forEach(android.graphics.Region, kotlin.jvm.functions.Function1<? super android.graphics.Rect,kotlin.Unit> action);
+    method public static inline infix android.graphics.Region and(android.graphics.Region, android.graphics.Rect r);
+    method public static inline infix android.graphics.Region and(android.graphics.Region, android.graphics.Region r);
+    method public static inline operator boolean contains(android.graphics.Region, android.graphics.Point p);
+    method public static inline void forEach(android.graphics.Region, kotlin.jvm.functions.Function1<? super android.graphics.Rect,kotlin.Unit> action);
     method public static operator java.util.Iterator<android.graphics.Rect> iterator(android.graphics.Region);
-    method public static operator android.graphics.Region minus(android.graphics.Region, android.graphics.Rect r);
-    method public static operator android.graphics.Region minus(android.graphics.Region, android.graphics.Region r);
-    method public static operator android.graphics.Region not(android.graphics.Region);
-    method public static infix android.graphics.Region or(android.graphics.Region, android.graphics.Rect r);
-    method public static infix android.graphics.Region or(android.graphics.Region, android.graphics.Region r);
-    method public static operator android.graphics.Region plus(android.graphics.Region, android.graphics.Rect r);
-    method public static operator android.graphics.Region plus(android.graphics.Region, android.graphics.Region r);
-    method public static operator android.graphics.Region unaryMinus(android.graphics.Region);
-    method public static infix android.graphics.Region xor(android.graphics.Region, android.graphics.Rect r);
-    method public static infix android.graphics.Region xor(android.graphics.Region, android.graphics.Region r);
+    method public static inline operator android.graphics.Region minus(android.graphics.Region, android.graphics.Rect r);
+    method public static inline operator android.graphics.Region minus(android.graphics.Region, android.graphics.Region r);
+    method public static inline operator android.graphics.Region not(android.graphics.Region);
+    method public static inline infix android.graphics.Region or(android.graphics.Region, android.graphics.Rect r);
+    method public static inline infix android.graphics.Region or(android.graphics.Region, android.graphics.Region r);
+    method public static inline operator android.graphics.Region plus(android.graphics.Region, android.graphics.Rect r);
+    method public static inline operator android.graphics.Region plus(android.graphics.Region, android.graphics.Region r);
+    method public static inline operator android.graphics.Region unaryMinus(android.graphics.Region);
+    method public static inline infix android.graphics.Region xor(android.graphics.Region, android.graphics.Rect r);
+    method public static inline infix android.graphics.Region xor(android.graphics.Region, android.graphics.Region r);
   }
 
   public final class ShaderKt {
     ctor public ShaderKt();
-    method public static void transform(android.graphics.Shader, kotlin.jvm.functions.Function1<? super android.graphics.Matrix,kotlin.Unit> block);
+    method public static inline void transform(android.graphics.Shader, kotlin.jvm.functions.Function1<? super android.graphics.Matrix,kotlin.Unit> block);
   }
 
 }
@@ -276,13 +277,13 @@
 
   public final class BitmapDrawableKt {
     ctor public BitmapDrawableKt();
-    method public static android.graphics.drawable.BitmapDrawable toDrawable(android.graphics.Bitmap, android.content.res.Resources resources);
+    method public static inline android.graphics.drawable.BitmapDrawable toDrawable(android.graphics.Bitmap, android.content.res.Resources resources);
   }
 
   public final class ColorDrawableKt {
     ctor public ColorDrawableKt();
-    method public static android.graphics.drawable.ColorDrawable toDrawable(int);
-    method @RequiresApi(26) public static android.graphics.drawable.ColorDrawable toDrawable(android.graphics.Color);
+    method public static inline android.graphics.drawable.ColorDrawable toDrawable(int);
+    method @RequiresApi(26) public static inline android.graphics.drawable.ColorDrawable toDrawable(android.graphics.Color);
   }
 
   public final class DrawableKt {
@@ -293,10 +294,10 @@
 
   public final class IconKt {
     ctor public IconKt();
-    method @RequiresApi(26) public static android.graphics.drawable.Icon toAdaptiveIcon(android.graphics.Bitmap);
-    method @RequiresApi(26) public static android.graphics.drawable.Icon toIcon(android.graphics.Bitmap);
-    method @RequiresApi(26) public static android.graphics.drawable.Icon toIcon(android.net.Uri);
-    method @RequiresApi(26) public static android.graphics.drawable.Icon toIcon(byte[]);
+    method @RequiresApi(26) public static inline android.graphics.drawable.Icon toAdaptiveIcon(android.graphics.Bitmap);
+    method @RequiresApi(26) public static inline android.graphics.drawable.Icon toIcon(android.graphics.Bitmap);
+    method @RequiresApi(26) public static inline android.graphics.drawable.Icon toIcon(android.net.Uri);
+    method @RequiresApi(26) public static inline android.graphics.drawable.Icon toIcon(byte[]);
   }
 
 }
@@ -305,8 +306,8 @@
 
   public final class LocationKt {
     ctor public LocationKt();
-    method public static operator double component1(android.location.Location);
-    method public static operator double component2(android.location.Location);
+    method public static inline operator double component1(android.location.Location);
+    method public static inline operator double component2(android.location.Location);
   }
 
 }
@@ -316,8 +317,8 @@
   public final class UriKt {
     ctor public UriKt();
     method public static java.io.File toFile(android.net.Uri);
-    method public static android.net.Uri toUri(String);
-    method public static android.net.Uri toUri(java.io.File);
+    method public static inline android.net.Uri toUri(String);
+    method public static inline android.net.Uri toUri(java.io.File);
   }
 
 }
@@ -331,8 +332,8 @@
 
   public final class HandlerKt {
     ctor public HandlerKt();
-    method public static Runnable postAtTime(android.os.Handler, long uptimeMillis, Object? token = null, kotlin.jvm.functions.Function0<kotlin.Unit> action);
-    method public static Runnable postDelayed(android.os.Handler, long delayInMillis, Object? token = null, kotlin.jvm.functions.Function0<kotlin.Unit> action);
+    method public static inline Runnable postAtTime(android.os.Handler, long uptimeMillis, Object? token = null, kotlin.jvm.functions.Function0<kotlin.Unit> action);
+    method public static inline Runnable postDelayed(android.os.Handler, long delayInMillis, Object? token = null, kotlin.jvm.functions.Function0<kotlin.Unit> action);
   }
 
   public final class PersistableBundleKt {
@@ -342,7 +343,7 @@
 
   public final class TraceKt {
     ctor public TraceKt();
-    method public static <T> T! trace(String sectionName, kotlin.jvm.functions.Function0<? extends T> block);
+    method public static inline <T> T! trace(String sectionName, kotlin.jvm.functions.Function0<? extends T> block);
   }
 
 }
@@ -351,53 +352,54 @@
 
   public final class CharSequenceKt {
     ctor public CharSequenceKt();
-    method public static boolean isDigitsOnly(CharSequence);
-    method public static int trimmedLength(CharSequence);
+    method public static inline boolean isDigitsOnly(CharSequence);
+    method public static inline int trimmedLength(CharSequence);
   }
 
   public final class HtmlKt {
     ctor public HtmlKt();
-    method public static android.text.Spanned parseAsHtml(String, int flags = 0, android.text.Html.ImageGetter? imageGetter = null, android.text.Html.TagHandler? tagHandler = null);
-    method public static String toHtml(android.text.Spanned, int option = 0);
+    method public static inline android.text.Spanned parseAsHtml(String, int flags = 0, android.text.Html.ImageGetter? imageGetter = null, android.text.Html.TagHandler? tagHandler = null);
+    method public static inline String toHtml(android.text.Spanned, int option = 0);
   }
 
   public final class LocaleKt {
     ctor public LocaleKt();
-    method @RequiresApi(17) public static int getLayoutDirection(java.util.Locale);
+    method @RequiresApi(17) public static inline int getLayoutDirection(java.util.Locale);
   }
 
   public final class SpannableStringBuilderKt {
     ctor public SpannableStringBuilderKt();
-    method public static android.text.SpannableStringBuilder backgroundColor(android.text.SpannableStringBuilder, @ColorInt int color, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder bold(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannedString buildSpannedString(kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder color(android.text.SpannableStringBuilder, @ColorInt int color, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder inSpans(android.text.SpannableStringBuilder, Object[] spans, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder inSpans(android.text.SpannableStringBuilder, Object span, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder italic(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder scale(android.text.SpannableStringBuilder, float proportion, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder strikeThrough(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder subscript(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder superscript(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder underline(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder backgroundColor(android.text.SpannableStringBuilder, @ColorInt int color, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder bold(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannedString buildSpannedString(kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder color(android.text.SpannableStringBuilder, @ColorInt int color, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder inSpans(android.text.SpannableStringBuilder, Object[] spans, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder inSpans(android.text.SpannableStringBuilder, Object span, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder italic(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder scale(android.text.SpannableStringBuilder, float proportion, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder strikeThrough(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder subscript(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder superscript(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder underline(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
   }
 
   public final class SpannableStringKt {
     ctor public SpannableStringKt();
-    method public static void clearSpans(android.text.Spannable);
-    method public static operator void set(android.text.Spannable, int start, int end, Object span);
-    method public static operator void set(android.text.Spannable, kotlin.ranges.IntRange range, Object span);
-    method public static android.text.Spannable toSpannable(CharSequence);
+    method public static inline void clearSpans(android.text.Spannable);
+    method public static inline operator void set(android.text.Spannable, int start, int end, Object span);
+    method public static inline operator void set(android.text.Spannable, kotlin.ranges.IntRange range, Object span);
+    method public static inline android.text.Spannable toSpannable(CharSequence);
   }
 
   public final class SpannedStringKt {
     ctor public SpannedStringKt();
-    method public static android.text.Spanned toSpanned(CharSequence);
+    method public static inline <reified T> T[]! getSpans(android.text.Spanned, int start = 0, int end = length);
+    method public static inline android.text.Spanned toSpanned(CharSequence);
   }
 
   public final class StringKt {
     ctor public StringKt();
-    method public static String htmlEncode(String);
+    method public static inline String htmlEncode(String);
   }
 
 }
@@ -406,12 +408,12 @@
 
   public final class TransitionKt {
     ctor public TransitionKt();
-    method @RequiresApi(19) public static android.transition.Transition.TransitionListener addListener(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onEnd = {}, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onStart = {}, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onCancel = {}, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onResume = {}, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onPause = {});
-    method @RequiresApi(19) public static android.transition.Transition.TransitionListener doOnCancel(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
-    method @RequiresApi(19) public static android.transition.Transition.TransitionListener doOnEnd(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
-    method @RequiresApi(19) public static android.transition.Transition.TransitionListener doOnPause(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
-    method @RequiresApi(19) public static android.transition.Transition.TransitionListener doOnResume(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
-    method @RequiresApi(19) public static android.transition.Transition.TransitionListener doOnStart(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
+    method @RequiresApi(19) public static inline android.transition.Transition.TransitionListener addListener(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onEnd = {}, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onStart = {}, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onCancel = {}, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onResume = {}, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onPause = {});
+    method @RequiresApi(19) public static inline android.transition.Transition.TransitionListener doOnCancel(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
+    method @RequiresApi(19) public static inline android.transition.Transition.TransitionListener doOnEnd(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
+    method @RequiresApi(19) public static inline android.transition.Transition.TransitionListener doOnPause(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
+    method @RequiresApi(19) public static inline android.transition.Transition.TransitionListener doOnResume(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
+    method @RequiresApi(19) public static inline android.transition.Transition.TransitionListener doOnStart(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
   }
 
 }
@@ -420,144 +422,144 @@
 
   public final class AtomicFileKt {
     ctor public AtomicFileKt();
-    method @RequiresApi(17) public static byte[] readBytes(android.util.AtomicFile);
+    method @RequiresApi(17) public static inline byte[] readBytes(android.util.AtomicFile);
     method @RequiresApi(17) public static String readText(android.util.AtomicFile, java.nio.charset.Charset charset = Charsets.UTF_8);
-    method @RequiresApi(17) public static void tryWrite(android.util.AtomicFile, kotlin.jvm.functions.Function1<? super java.io.FileOutputStream,kotlin.Unit> block);
+    method @RequiresApi(17) public static inline void tryWrite(android.util.AtomicFile, kotlin.jvm.functions.Function1<? super java.io.FileOutputStream,kotlin.Unit> block);
     method @RequiresApi(17) public static void writeBytes(android.util.AtomicFile, byte[] array);
     method @RequiresApi(17) public static void writeText(android.util.AtomicFile, String text, java.nio.charset.Charset charset = Charsets.UTF_8);
   }
 
   public final class HalfKt {
     ctor public HalfKt();
-    method @RequiresApi(26) public static android.util.Half toHalf(short);
-    method @RequiresApi(26) public static android.util.Half toHalf(float);
-    method @RequiresApi(26) public static android.util.Half toHalf(double);
-    method @RequiresApi(26) public static android.util.Half toHalf(String);
+    method @RequiresApi(26) public static inline android.util.Half toHalf(short);
+    method @RequiresApi(26) public static inline android.util.Half toHalf(float);
+    method @RequiresApi(26) public static inline android.util.Half toHalf(double);
+    method @RequiresApi(26) public static inline android.util.Half toHalf(String);
   }
 
   public final class LongSparseArrayKt {
     ctor public LongSparseArrayKt();
-    method @RequiresApi(16) public static operator <T> boolean contains(android.util.LongSparseArray<T>, long key);
-    method @RequiresApi(16) public static <T> boolean containsKey(android.util.LongSparseArray<T>, long key);
-    method @RequiresApi(16) public static <T> boolean containsValue(android.util.LongSparseArray<T>, T! value);
-    method @RequiresApi(16) public static <T> void forEach(android.util.LongSparseArray<T>, kotlin.jvm.functions.Function2<? super java.lang.Long,? super T,kotlin.Unit> action);
-    method @RequiresApi(16) public static <T> T! getOrDefault(android.util.LongSparseArray<T>, long key, T! defaultValue);
-    method @RequiresApi(16) public static <T> T! getOrElse(android.util.LongSparseArray<T>, long key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
-    method @RequiresApi(16) public static <T> int getSize(android.util.LongSparseArray<T>);
-    method @RequiresApi(16) public static <T> boolean isEmpty(android.util.LongSparseArray<T>);
-    method @RequiresApi(16) public static <T> boolean isNotEmpty(android.util.LongSparseArray<T>);
+    method @RequiresApi(16) public static inline operator <T> boolean contains(android.util.LongSparseArray<T>, long key);
+    method @RequiresApi(16) public static inline <T> boolean containsKey(android.util.LongSparseArray<T>, long key);
+    method @RequiresApi(16) public static inline <T> boolean containsValue(android.util.LongSparseArray<T>, T! value);
+    method @RequiresApi(16) public static inline <T> void forEach(android.util.LongSparseArray<T>, kotlin.jvm.functions.Function2<? super java.lang.Long,? super T,kotlin.Unit> action);
+    method @RequiresApi(16) public static inline <T> T! getOrDefault(android.util.LongSparseArray<T>, long key, T! defaultValue);
+    method @RequiresApi(16) public static inline <T> T! getOrElse(android.util.LongSparseArray<T>, long key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method @RequiresApi(16) public static inline <T> int getSize(android.util.LongSparseArray<T>);
+    method @RequiresApi(16) public static inline <T> boolean isEmpty(android.util.LongSparseArray<T>);
+    method @RequiresApi(16) public static inline <T> boolean isNotEmpty(android.util.LongSparseArray<T>);
     method @RequiresApi(16) public static <T> kotlin.collections.LongIterator keyIterator(android.util.LongSparseArray<T>);
     method @RequiresApi(16) public static operator <T> android.util.LongSparseArray<T> plus(android.util.LongSparseArray<T>, android.util.LongSparseArray<T> other);
     method @RequiresApi(16) public static <T> void putAll(android.util.LongSparseArray<T>, android.util.LongSparseArray<T> other);
     method @RequiresApi(16) public static <T> boolean remove(android.util.LongSparseArray<T>, long key, T! value);
-    method @RequiresApi(16) public static operator <T> void set(android.util.LongSparseArray<T>, long key, T! value);
+    method @RequiresApi(16) public static inline operator <T> void set(android.util.LongSparseArray<T>, long key, T! value);
     method @RequiresApi(16) public static <T> java.util.Iterator<T> valueIterator(android.util.LongSparseArray<T>);
   }
 
   public final class LruCacheKt {
     ctor public LruCacheKt();
-    method public static <K, V> android.util.LruCache<K,V> lruCache(int maxSize, kotlin.jvm.functions.Function2<? super K,? super V,java.lang.Integer> sizeOf = { _, _ -> 1 }, kotlin.jvm.functions.Function1<? super K,? extends V> create = { (V)null }, kotlin.jvm.functions.Function4<? super java.lang.Boolean,? super K,? super V,? super V,kotlin.Unit> onEntryRemoved = { _, _, _, _ ->  });
+    method public static inline <K, V> android.util.LruCache<K,V> lruCache(int maxSize, kotlin.jvm.functions.Function2<? super K,? super V,java.lang.Integer> sizeOf = { _, _ -> 1 }, kotlin.jvm.functions.Function1<? super K,? extends V> create = { (V)null }, kotlin.jvm.functions.Function4<? super java.lang.Boolean,? super K,? super V,? super V,kotlin.Unit> onEntryRemoved = { _, _, _, _ ->  });
   }
 
   public final class PairKt {
     ctor public PairKt();
-    method public static operator <F, S> F! component1(android.util.Pair<F,S>);
-    method public static operator <F, S> S! component2(android.util.Pair<F,S>);
-    method public static <F, S> android.util.Pair<F,S> toAndroidPair(kotlin.Pair<? extends F,? extends S>);
-    method public static <F, S> kotlin.Pair<F,S> toKotlinPair(android.util.Pair<F,S>);
+    method public static inline operator <F, S> F! component1(android.util.Pair<F,S>);
+    method public static inline operator <F, S> S! component2(android.util.Pair<F,S>);
+    method public static inline <F, S> android.util.Pair<F,S> toAndroidPair(kotlin.Pair<? extends F,? extends S>);
+    method public static inline <F, S> kotlin.Pair<F,S> toKotlinPair(android.util.Pair<F,S>);
   }
 
   public final class RangeKt {
     ctor public RangeKt();
-    method @RequiresApi(21) public static infix <T extends java.lang.Comparable<? super T>> android.util.Range<T> and(android.util.Range<T>, android.util.Range<T> other);
-    method @RequiresApi(21) public static operator <T extends java.lang.Comparable<? super T>> android.util.Range<T> plus(android.util.Range<T>, T value);
-    method @RequiresApi(21) public static operator <T extends java.lang.Comparable<? super T>> android.util.Range<T> plus(android.util.Range<T>, android.util.Range<T> other);
-    method @RequiresApi(21) public static infix <T extends java.lang.Comparable<? super T>> android.util.Range<T> rangeTo(T, T that);
+    method @RequiresApi(21) public static inline infix <T extends java.lang.Comparable<? super T>> android.util.Range<T> and(android.util.Range<T>, android.util.Range<T> other);
+    method @RequiresApi(21) public static inline operator <T extends java.lang.Comparable<? super T>> android.util.Range<T> plus(android.util.Range<T>, T value);
+    method @RequiresApi(21) public static inline operator <T extends java.lang.Comparable<? super T>> android.util.Range<T> plus(android.util.Range<T>, android.util.Range<T> other);
+    method @RequiresApi(21) public static inline infix <T extends java.lang.Comparable<? super T>> android.util.Range<T> rangeTo(T, T that);
     method @RequiresApi(21) public static <T extends java.lang.Comparable<? super T>> kotlin.ranges.ClosedRange<T> toClosedRange(android.util.Range<T>);
     method @RequiresApi(21) public static <T extends java.lang.Comparable<? super T>> android.util.Range<T> toRange(kotlin.ranges.ClosedRange<T>);
   }
 
   public final class SizeKt {
     ctor public SizeKt();
-    method @RequiresApi(21) public static operator int component1(android.util.Size);
-    method @RequiresApi(21) public static operator float component1(android.util.SizeF);
-    method @RequiresApi(21) public static operator int component2(android.util.Size);
-    method @RequiresApi(21) public static operator float component2(android.util.SizeF);
+    method @RequiresApi(21) public static inline operator int component1(android.util.Size);
+    method @RequiresApi(21) public static inline operator float component1(android.util.SizeF);
+    method @RequiresApi(21) public static inline operator int component2(android.util.Size);
+    method @RequiresApi(21) public static inline operator float component2(android.util.SizeF);
   }
 
   public final class SparseArrayKt {
     ctor public SparseArrayKt();
-    method public static operator <T> boolean contains(android.util.SparseArray<T>, int key);
-    method public static <T> boolean containsKey(android.util.SparseArray<T>, int key);
-    method public static <T> boolean containsValue(android.util.SparseArray<T>, T! value);
-    method public static <T> void forEach(android.util.SparseArray<T>, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> action);
-    method public static <T> T! getOrDefault(android.util.SparseArray<T>, int key, T! defaultValue);
-    method public static <T> T! getOrElse(android.util.SparseArray<T>, int key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
-    method public static <T> int getSize(android.util.SparseArray<T>);
-    method public static <T> boolean isEmpty(android.util.SparseArray<T>);
-    method public static <T> boolean isNotEmpty(android.util.SparseArray<T>);
+    method public static inline operator <T> boolean contains(android.util.SparseArray<T>, int key);
+    method public static inline <T> boolean containsKey(android.util.SparseArray<T>, int key);
+    method public static inline <T> boolean containsValue(android.util.SparseArray<T>, T! value);
+    method public static inline <T> void forEach(android.util.SparseArray<T>, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> action);
+    method public static inline <T> T! getOrDefault(android.util.SparseArray<T>, int key, T! defaultValue);
+    method public static inline <T> T! getOrElse(android.util.SparseArray<T>, int key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method public static inline <T> int getSize(android.util.SparseArray<T>);
+    method public static inline <T> boolean isEmpty(android.util.SparseArray<T>);
+    method public static inline <T> boolean isNotEmpty(android.util.SparseArray<T>);
     method public static <T> kotlin.collections.IntIterator keyIterator(android.util.SparseArray<T>);
     method public static operator <T> android.util.SparseArray<T> plus(android.util.SparseArray<T>, android.util.SparseArray<T> other);
     method public static <T> void putAll(android.util.SparseArray<T>, android.util.SparseArray<T> other);
     method public static <T> boolean remove(android.util.SparseArray<T>, int key, T! value);
-    method public static operator <T> void set(android.util.SparseArray<T>, int key, T! value);
+    method public static inline operator <T> void set(android.util.SparseArray<T>, int key, T! value);
     method public static <T> java.util.Iterator<T> valueIterator(android.util.SparseArray<T>);
   }
 
   public final class SparseBooleanArrayKt {
     ctor public SparseBooleanArrayKt();
-    method public static operator boolean contains(android.util.SparseBooleanArray, int key);
-    method public static boolean containsKey(android.util.SparseBooleanArray, int key);
-    method public static boolean containsValue(android.util.SparseBooleanArray, boolean value);
-    method public static void forEach(android.util.SparseBooleanArray, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Boolean,kotlin.Unit> action);
-    method public static boolean getOrDefault(android.util.SparseBooleanArray, int key, boolean defaultValue);
-    method public static boolean getOrElse(android.util.SparseBooleanArray, int key, kotlin.jvm.functions.Function0<java.lang.Boolean> defaultValue);
-    method public static int getSize(android.util.SparseBooleanArray);
-    method public static boolean isEmpty(android.util.SparseBooleanArray);
-    method public static boolean isNotEmpty(android.util.SparseBooleanArray);
+    method public static inline operator boolean contains(android.util.SparseBooleanArray, int key);
+    method public static inline boolean containsKey(android.util.SparseBooleanArray, int key);
+    method public static inline boolean containsValue(android.util.SparseBooleanArray, boolean value);
+    method public static inline void forEach(android.util.SparseBooleanArray, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Boolean,kotlin.Unit> action);
+    method public static inline boolean getOrDefault(android.util.SparseBooleanArray, int key, boolean defaultValue);
+    method public static inline boolean getOrElse(android.util.SparseBooleanArray, int key, kotlin.jvm.functions.Function0<java.lang.Boolean> defaultValue);
+    method public static inline int getSize(android.util.SparseBooleanArray);
+    method public static inline boolean isEmpty(android.util.SparseBooleanArray);
+    method public static inline boolean isNotEmpty(android.util.SparseBooleanArray);
     method public static kotlin.collections.IntIterator keyIterator(android.util.SparseBooleanArray);
     method public static operator android.util.SparseBooleanArray plus(android.util.SparseBooleanArray, android.util.SparseBooleanArray other);
     method public static void putAll(android.util.SparseBooleanArray, android.util.SparseBooleanArray other);
     method public static boolean remove(android.util.SparseBooleanArray, int key, boolean value);
-    method public static operator void set(android.util.SparseBooleanArray, int key, boolean value);
+    method public static inline operator void set(android.util.SparseBooleanArray, int key, boolean value);
     method public static kotlin.collections.BooleanIterator valueIterator(android.util.SparseBooleanArray);
   }
 
   public final class SparseIntArrayKt {
     ctor public SparseIntArrayKt();
-    method public static operator boolean contains(android.util.SparseIntArray, int key);
-    method public static boolean containsKey(android.util.SparseIntArray, int key);
-    method public static boolean containsValue(android.util.SparseIntArray, int value);
-    method public static void forEach(android.util.SparseIntArray, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> action);
-    method public static int getOrDefault(android.util.SparseIntArray, int key, int defaultValue);
-    method public static int getOrElse(android.util.SparseIntArray, int key, kotlin.jvm.functions.Function0<java.lang.Integer> defaultValue);
-    method public static int getSize(android.util.SparseIntArray);
-    method public static boolean isEmpty(android.util.SparseIntArray);
-    method public static boolean isNotEmpty(android.util.SparseIntArray);
+    method public static inline operator boolean contains(android.util.SparseIntArray, int key);
+    method public static inline boolean containsKey(android.util.SparseIntArray, int key);
+    method public static inline boolean containsValue(android.util.SparseIntArray, int value);
+    method public static inline void forEach(android.util.SparseIntArray, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> action);
+    method public static inline int getOrDefault(android.util.SparseIntArray, int key, int defaultValue);
+    method public static inline int getOrElse(android.util.SparseIntArray, int key, kotlin.jvm.functions.Function0<java.lang.Integer> defaultValue);
+    method public static inline int getSize(android.util.SparseIntArray);
+    method public static inline boolean isEmpty(android.util.SparseIntArray);
+    method public static inline boolean isNotEmpty(android.util.SparseIntArray);
     method public static kotlin.collections.IntIterator keyIterator(android.util.SparseIntArray);
     method public static operator android.util.SparseIntArray plus(android.util.SparseIntArray, android.util.SparseIntArray other);
     method public static void putAll(android.util.SparseIntArray, android.util.SparseIntArray other);
     method public static boolean remove(android.util.SparseIntArray, int key, int value);
-    method public static operator void set(android.util.SparseIntArray, int key, int value);
+    method public static inline operator void set(android.util.SparseIntArray, int key, int value);
     method public static kotlin.collections.IntIterator valueIterator(android.util.SparseIntArray);
   }
 
   public final class SparseLongArrayKt {
     ctor public SparseLongArrayKt();
-    method @RequiresApi(18) public static operator boolean contains(android.util.SparseLongArray, int key);
-    method @RequiresApi(18) public static boolean containsKey(android.util.SparseLongArray, int key);
-    method @RequiresApi(18) public static boolean containsValue(android.util.SparseLongArray, long value);
-    method @RequiresApi(18) public static void forEach(android.util.SparseLongArray, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Long,kotlin.Unit> action);
-    method @RequiresApi(18) public static long getOrDefault(android.util.SparseLongArray, int key, long defaultValue);
-    method @RequiresApi(18) public static long getOrElse(android.util.SparseLongArray, int key, kotlin.jvm.functions.Function0<java.lang.Long> defaultValue);
-    method @RequiresApi(18) public static int getSize(android.util.SparseLongArray);
-    method @RequiresApi(18) public static boolean isEmpty(android.util.SparseLongArray);
-    method @RequiresApi(18) public static boolean isNotEmpty(android.util.SparseLongArray);
+    method @RequiresApi(18) public static inline operator boolean contains(android.util.SparseLongArray, int key);
+    method @RequiresApi(18) public static inline boolean containsKey(android.util.SparseLongArray, int key);
+    method @RequiresApi(18) public static inline boolean containsValue(android.util.SparseLongArray, long value);
+    method @RequiresApi(18) public static inline void forEach(android.util.SparseLongArray, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Long,kotlin.Unit> action);
+    method @RequiresApi(18) public static inline long getOrDefault(android.util.SparseLongArray, int key, long defaultValue);
+    method @RequiresApi(18) public static inline long getOrElse(android.util.SparseLongArray, int key, kotlin.jvm.functions.Function0<java.lang.Long> defaultValue);
+    method @RequiresApi(18) public static inline int getSize(android.util.SparseLongArray);
+    method @RequiresApi(18) public static inline boolean isEmpty(android.util.SparseLongArray);
+    method @RequiresApi(18) public static inline boolean isNotEmpty(android.util.SparseLongArray);
     method @RequiresApi(18) public static kotlin.collections.IntIterator keyIterator(android.util.SparseLongArray);
     method @RequiresApi(18) public static operator android.util.SparseLongArray plus(android.util.SparseLongArray, android.util.SparseLongArray other);
     method @RequiresApi(18) public static void putAll(android.util.SparseLongArray, android.util.SparseLongArray other);
     method @RequiresApi(18) public static boolean remove(android.util.SparseLongArray, int key, long value);
-    method @RequiresApi(18) public static operator void set(android.util.SparseLongArray, int key, long value);
+    method @RequiresApi(18) public static inline operator void set(android.util.SparseLongArray, int key, long value);
     method @RequiresApi(18) public static kotlin.collections.LongIterator valueIterator(android.util.SparseLongArray);
   }
 
@@ -568,59 +570,60 @@
   public final class MenuKt {
     ctor public MenuKt();
     method public static operator boolean contains(android.view.Menu, android.view.MenuItem item);
-    method public static void forEach(android.view.Menu, kotlin.jvm.functions.Function1<? super android.view.MenuItem,kotlin.Unit> action);
-    method public static void forEachIndexed(android.view.Menu, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super android.view.MenuItem,kotlin.Unit> action);
-    method public static operator android.view.MenuItem get(android.view.Menu, int index);
+    method public static inline void forEach(android.view.Menu, kotlin.jvm.functions.Function1<? super android.view.MenuItem,kotlin.Unit> action);
+    method public static inline void forEachIndexed(android.view.Menu, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super android.view.MenuItem,kotlin.Unit> action);
+    method public static inline operator android.view.MenuItem get(android.view.Menu, int index);
     method public static kotlin.sequences.Sequence<android.view.MenuItem> getChildren(android.view.Menu);
-    method public static int getSize(android.view.Menu);
-    method public static boolean isEmpty(android.view.Menu);
-    method public static boolean isNotEmpty(android.view.Menu);
+    method public static inline int getSize(android.view.Menu);
+    method public static inline boolean isEmpty(android.view.Menu);
+    method public static inline boolean isNotEmpty(android.view.Menu);
     method public static operator java.util.Iterator<android.view.MenuItem> iterator(android.view.Menu);
-    method public static operator void minusAssign(android.view.Menu, android.view.MenuItem item);
+    method public static inline operator void minusAssign(android.view.Menu, android.view.MenuItem item);
   }
 
   public final class ViewGroupKt {
     ctor public ViewGroupKt();
-    method public static operator boolean contains(android.view.ViewGroup, android.view.View view);
-    method public static void forEach(android.view.ViewGroup, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
-    method public static void forEachIndexed(android.view.ViewGroup, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super android.view.View,kotlin.Unit> action);
+    method public static inline operator boolean contains(android.view.ViewGroup, android.view.View view);
+    method public static inline void forEach(android.view.ViewGroup, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
+    method public static inline void forEachIndexed(android.view.ViewGroup, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super android.view.View,kotlin.Unit> action);
     method public static operator android.view.View get(android.view.ViewGroup, int index);
     method public static kotlin.sequences.Sequence<android.view.View> getChildren(android.view.ViewGroup);
-    method public static int getSize(android.view.ViewGroup);
-    method public static boolean isEmpty(android.view.ViewGroup);
-    method public static boolean isNotEmpty(android.view.ViewGroup);
+    method public static inline int getSize(android.view.ViewGroup);
+    method public static inline boolean isEmpty(android.view.ViewGroup);
+    method public static inline boolean isNotEmpty(android.view.ViewGroup);
     method public static operator java.util.Iterator<android.view.View> iterator(android.view.ViewGroup);
-    method public static operator void minusAssign(android.view.ViewGroup, android.view.View view);
-    method public static operator void plusAssign(android.view.ViewGroup, android.view.View view);
-    method public static void setMargins(android.view.ViewGroup.MarginLayoutParams, @Px int size);
-    method public static void updateMargins(android.view.ViewGroup.MarginLayoutParams, @Px int left = android.view.ViewGroup.MarginLayoutParams.leftMargin, @Px int top = android.view.ViewGroup.MarginLayoutParams.topMargin, @Px int right = android.view.ViewGroup.MarginLayoutParams.rightMargin, @Px int bottom = android.view.ViewGroup.MarginLayoutParams.bottomMargin);
-    method @RequiresApi(17) public static void updateMarginsRelative(android.view.ViewGroup.MarginLayoutParams, @Px int start = marginStart, @Px int top = android.view.ViewGroup.MarginLayoutParams.topMargin, @Px int end = marginEnd, @Px int bottom = android.view.ViewGroup.MarginLayoutParams.bottomMargin);
+    method public static inline operator void minusAssign(android.view.ViewGroup, android.view.View view);
+    method public static inline operator void plusAssign(android.view.ViewGroup, android.view.View view);
+    method public static inline void setMargins(android.view.ViewGroup.MarginLayoutParams, @Px int size);
+    method public static inline void updateMargins(android.view.ViewGroup.MarginLayoutParams, @Px int left = android.view.ViewGroup.MarginLayoutParams.leftMargin, @Px int top = android.view.ViewGroup.MarginLayoutParams.topMargin, @Px int right = android.view.ViewGroup.MarginLayoutParams.rightMargin, @Px int bottom = android.view.ViewGroup.MarginLayoutParams.bottomMargin);
+    method @RequiresApi(17) public static inline void updateMarginsRelative(android.view.ViewGroup.MarginLayoutParams, @Px int start = marginStart, @Px int top = android.view.ViewGroup.MarginLayoutParams.topMargin, @Px int end = marginEnd, @Px int bottom = android.view.ViewGroup.MarginLayoutParams.bottomMargin);
   }
 
   public final class ViewKt {
     ctor public ViewKt();
-    method public static void doOnLayout(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
-    method public static void doOnNextLayout(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
-    method public static androidx.core.view.OneShotPreDrawListener doOnPreDraw(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
+    method public static inline void doOnLayout(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
+    method public static inline void doOnNextLayout(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
+    method public static inline androidx.core.view.OneShotPreDrawListener doOnPreDraw(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
     method public static android.graphics.Bitmap drawToBitmap(android.view.View, android.graphics.Bitmap.Config config = android.graphics.Bitmap.Config.ARGB_8888);
-    method public static int getMarginBottom(android.view.View);
-    method public static int getMarginEnd(android.view.View);
-    method public static int getMarginLeft(android.view.View);
-    method public static int getMarginRight(android.view.View);
-    method public static int getMarginStart(android.view.View);
-    method public static int getMarginTop(android.view.View);
-    method public static boolean isGone(android.view.View);
-    method public static boolean isInvisible(android.view.View);
-    method public static boolean isVisible(android.view.View);
-    method public static Runnable postDelayed(android.view.View, long delayInMillis, kotlin.jvm.functions.Function0<kotlin.Unit> action);
-    method @RequiresApi(16) public static Runnable postOnAnimationDelayed(android.view.View, long delayInMillis, kotlin.jvm.functions.Function0<kotlin.Unit> action);
-    method public static void setGone(android.view.View, boolean value);
-    method public static void setInvisible(android.view.View, boolean value);
-    method public static void setPadding(android.view.View, @Px int size);
-    method public static void setVisible(android.view.View, boolean value);
-    method public static void updateLayoutParams(android.view.View, kotlin.jvm.functions.Function1<? super android.view.ViewGroup.LayoutParams,kotlin.Unit> block);
-    method public static void updatePadding(android.view.View, @Px int left = paddingLeft, @Px int top = paddingTop, @Px int right = paddingRight, @Px int bottom = paddingBottom);
-    method @RequiresApi(17) public static void updatePaddingRelative(android.view.View, @Px int start = paddingStart, @Px int top = paddingTop, @Px int end = paddingEnd, @Px int bottom = paddingBottom);
+    method public static inline int getMarginBottom(android.view.View);
+    method public static inline int getMarginEnd(android.view.View);
+    method public static inline int getMarginLeft(android.view.View);
+    method public static inline int getMarginRight(android.view.View);
+    method public static inline int getMarginStart(android.view.View);
+    method public static inline int getMarginTop(android.view.View);
+    method public static inline boolean isGone(android.view.View);
+    method public static inline boolean isInvisible(android.view.View);
+    method public static inline boolean isVisible(android.view.View);
+    method public static inline Runnable postDelayed(android.view.View, long delayInMillis, kotlin.jvm.functions.Function0<kotlin.Unit> action);
+    method @RequiresApi(16) public static inline Runnable postOnAnimationDelayed(android.view.View, long delayInMillis, kotlin.jvm.functions.Function0<kotlin.Unit> action);
+    method public static inline void setGone(android.view.View, boolean value);
+    method public static inline void setInvisible(android.view.View, boolean value);
+    method public static inline void setPadding(android.view.View, @Px int size);
+    method public static inline void setVisible(android.view.View, boolean value);
+    method public static inline void updateLayoutParams(android.view.View, kotlin.jvm.functions.Function1<? super android.view.ViewGroup.LayoutParams,kotlin.Unit> block);
+    method public static inline <reified T extends android.view.ViewGroup.LayoutParams> void updateLayoutParamsTyped(android.view.View, kotlin.jvm.functions.Function1<? super T,kotlin.Unit>! block);
+    method public static inline void updatePadding(android.view.View, @Px int left = paddingLeft, @Px int top = paddingTop, @Px int right = paddingRight, @Px int bottom = paddingBottom);
+    method @RequiresApi(17) public static inline void updatePaddingRelative(android.view.View, @Px int start = paddingStart, @Px int top = paddingTop, @Px int end = paddingEnd, @Px int bottom = paddingBottom);
   }
 
 }
@@ -629,10 +632,10 @@
 
   public final class TextViewKt {
     ctor public TextViewKt();
-    method public static android.text.TextWatcher addTextChangedListener(android.widget.TextView, kotlin.jvm.functions.Function4<? super java.lang.CharSequence,? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> beforeTextChanged = { _, _, _, _ ->  }, kotlin.jvm.functions.Function4<? super java.lang.CharSequence,? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> onTextChanged = { _, _, _, _ ->  }, kotlin.jvm.functions.Function1<? super android.text.Editable,kotlin.Unit> afterTextChanged = {});
-    method public static android.text.TextWatcher doAfterTextChanged(android.widget.TextView, kotlin.jvm.functions.Function1<? super android.text.Editable,kotlin.Unit> action);
-    method public static android.text.TextWatcher doBeforeTextChanged(android.widget.TextView, kotlin.jvm.functions.Function4<? super java.lang.CharSequence,? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> action);
-    method public static android.text.TextWatcher doOnTextChanged(android.widget.TextView, kotlin.jvm.functions.Function4<? super java.lang.CharSequence,? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> action);
+    method public static inline android.text.TextWatcher addTextChangedListener(android.widget.TextView, kotlin.jvm.functions.Function4<? super java.lang.CharSequence,? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> beforeTextChanged = { _, _, _, _ ->  }, kotlin.jvm.functions.Function4<? super java.lang.CharSequence,? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> onTextChanged = { _, _, _, _ ->  }, kotlin.jvm.functions.Function1<? super android.text.Editable,kotlin.Unit> afterTextChanged = {});
+    method public static inline android.text.TextWatcher doAfterTextChanged(android.widget.TextView, kotlin.jvm.functions.Function1<? super android.text.Editable,kotlin.Unit> action);
+    method public static inline android.text.TextWatcher doBeforeTextChanged(android.widget.TextView, kotlin.jvm.functions.Function4<? super java.lang.CharSequence,? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> action);
+    method public static inline android.text.TextWatcher doOnTextChanged(android.widget.TextView, kotlin.jvm.functions.Function4<? super java.lang.CharSequence,? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> action);
   }
 
 }
diff --git a/core/ktx/api/current.txt b/core/ktx/api/current.txt
index 6813932..63739d2 100644
--- a/core/ktx/api/current.txt
+++ b/core/ktx/api/current.txt
@@ -1,16 +1,16 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.core.animation {
 
   public final class AnimatorKt {
     ctor public AnimatorKt();
-    method public static android.animation.Animator.AnimatorListener addListener(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onEnd = {}, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onStart = {}, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onCancel = {}, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onRepeat = {});
-    method @RequiresApi(19) public static android.animation.Animator.AnimatorPauseListener addPauseListener(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onResume = {}, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onPause = {});
-    method public static android.animation.Animator.AnimatorListener doOnCancel(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
-    method public static android.animation.Animator.AnimatorListener doOnEnd(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
-    method @RequiresApi(19) public static android.animation.Animator.AnimatorPauseListener doOnPause(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
-    method public static android.animation.Animator.AnimatorListener doOnRepeat(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
-    method @RequiresApi(19) public static android.animation.Animator.AnimatorPauseListener doOnResume(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
-    method public static android.animation.Animator.AnimatorListener doOnStart(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
+    method public static inline android.animation.Animator.AnimatorListener addListener(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onEnd = {}, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onStart = {}, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onCancel = {}, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onRepeat = {});
+    method @RequiresApi(19) public static inline android.animation.Animator.AnimatorPauseListener addPauseListener(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onResume = {}, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> onPause = {});
+    method public static inline android.animation.Animator.AnimatorListener doOnCancel(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
+    method public static inline android.animation.Animator.AnimatorListener doOnEnd(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
+    method @RequiresApi(19) public static inline android.animation.Animator.AnimatorPauseListener doOnPause(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
+    method public static inline android.animation.Animator.AnimatorListener doOnRepeat(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
+    method @RequiresApi(19) public static inline android.animation.Animator.AnimatorPauseListener doOnResume(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
+    method public static inline android.animation.Animator.AnimatorListener doOnStart(android.animation.Animator, kotlin.jvm.functions.Function1<? super android.animation.Animator,kotlin.Unit> action);
   }
 
 }
@@ -24,13 +24,14 @@
 
   public final class ContextKt {
     ctor public ContextKt();
-    method public static void withStyledAttributes(android.content.Context, android.util.AttributeSet? set = null, int[] attrs, @AttrRes int defStyleAttr = 0, @StyleRes int defStyleRes = 0, kotlin.jvm.functions.Function1<? super android.content.res.TypedArray,kotlin.Unit> block);
-    method public static void withStyledAttributes(android.content.Context, @StyleRes int resourceId, int[] attrs, kotlin.jvm.functions.Function1<? super android.content.res.TypedArray,kotlin.Unit> block);
+    method public static inline <reified T> T! getSystemService(android.content.Context);
+    method public static inline void withStyledAttributes(android.content.Context, android.util.AttributeSet? set = null, int[] attrs, @AttrRes int defStyleAttr = 0, @StyleRes int defStyleRes = 0, kotlin.jvm.functions.Function1<? super android.content.res.TypedArray,kotlin.Unit> block);
+    method public static inline void withStyledAttributes(android.content.Context, @StyleRes int resourceId, int[] attrs, kotlin.jvm.functions.Function1<? super android.content.res.TypedArray,kotlin.Unit> block);
   }
 
   public final class SharedPreferencesKt {
     ctor public SharedPreferencesKt();
-    method public static void edit(android.content.SharedPreferences, boolean commit = false, kotlin.jvm.functions.Function1<? super android.content.SharedPreferences.Editor,kotlin.Unit> action);
+    method public static inline void edit(android.content.SharedPreferences, boolean commit = false, kotlin.jvm.functions.Function1<? super android.content.SharedPreferences.Editor,kotlin.Unit> action);
   }
 
 }
@@ -54,7 +55,7 @@
     method public static String getStringOrThrow(android.content.res.TypedArray, @StyleableRes int index);
     method public static CharSequence[] getTextArrayOrThrow(android.content.res.TypedArray, @StyleableRes int index);
     method public static CharSequence getTextOrThrow(android.content.res.TypedArray, @StyleableRes int index);
-    method public static <R> R! use(android.content.res.TypedArray, kotlin.jvm.functions.Function1<? super android.content.res.TypedArray,? extends R> block);
+    method public static inline <R> R! use(android.content.res.TypedArray, kotlin.jvm.functions.Function1<? super android.content.res.TypedArray,? extends R> block);
   }
 
 }
@@ -63,13 +64,13 @@
 
   public final class CursorKt {
     ctor public CursorKt();
-    method public static byte[]? getBlobOrNull(android.database.Cursor, int index);
-    method public static Double? getDoubleOrNull(android.database.Cursor, int index);
-    method public static Float? getFloatOrNull(android.database.Cursor, int index);
-    method public static Integer? getIntOrNull(android.database.Cursor, int index);
-    method public static Long? getLongOrNull(android.database.Cursor, int index);
-    method public static Short? getShortOrNull(android.database.Cursor, int index);
-    method public static String? getStringOrNull(android.database.Cursor, int index);
+    method public static inline byte[]? getBlobOrNull(android.database.Cursor, int index);
+    method public static inline Double? getDoubleOrNull(android.database.Cursor, int index);
+    method public static inline Float? getFloatOrNull(android.database.Cursor, int index);
+    method public static inline Integer? getIntOrNull(android.database.Cursor, int index);
+    method public static inline Long? getLongOrNull(android.database.Cursor, int index);
+    method public static inline Short? getShortOrNull(android.database.Cursor, int index);
+    method public static inline String? getStringOrNull(android.database.Cursor, int index);
   }
 
 }
@@ -78,7 +79,7 @@
 
   public final class SQLiteDatabaseKt {
     ctor public SQLiteDatabaseKt();
-    method public static <T> T! transaction(android.database.sqlite.SQLiteDatabase, boolean exclusive = true, kotlin.jvm.functions.Function1<? super android.database.sqlite.SQLiteDatabase,? extends T> body);
+    method public static inline <T> T! transaction(android.database.sqlite.SQLiteDatabase, boolean exclusive = true, kotlin.jvm.functions.Function1<? super android.database.sqlite.SQLiteDatabase,? extends T> body);
   }
 
 }
@@ -87,187 +88,187 @@
 
   public final class BitmapKt {
     ctor public BitmapKt();
-    method public static android.graphics.Bitmap applyCanvas(android.graphics.Bitmap, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static operator boolean contains(android.graphics.Bitmap, android.graphics.Point p);
-    method public static operator boolean contains(android.graphics.Bitmap, android.graphics.PointF p);
-    method public static android.graphics.Bitmap createBitmap(int width, int height, android.graphics.Bitmap.Config config = android.graphics.Bitmap.Config.ARGB_8888);
-    method @RequiresApi(26) public static android.graphics.Bitmap createBitmap(int width, int height, android.graphics.Bitmap.Config config = android.graphics.Bitmap.Config.ARGB_8888, boolean hasAlpha = true, android.graphics.ColorSpace colorSpace = ColorSpace.get(ColorSpace.Named.SRGB));
-    method public static operator int get(android.graphics.Bitmap, int x, int y);
-    method public static android.graphics.Bitmap scale(android.graphics.Bitmap, int width, int height, boolean filter = true);
-    method public static operator void set(android.graphics.Bitmap, int x, int y, @ColorInt int color);
+    method public static inline android.graphics.Bitmap applyCanvas(android.graphics.Bitmap, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline operator boolean contains(android.graphics.Bitmap, android.graphics.Point p);
+    method public static inline operator boolean contains(android.graphics.Bitmap, android.graphics.PointF p);
+    method public static inline android.graphics.Bitmap createBitmap(int width, int height, android.graphics.Bitmap.Config config = android.graphics.Bitmap.Config.ARGB_8888);
+    method @RequiresApi(26) public static inline android.graphics.Bitmap createBitmap(int width, int height, android.graphics.Bitmap.Config config = android.graphics.Bitmap.Config.ARGB_8888, boolean hasAlpha = true, android.graphics.ColorSpace colorSpace = ColorSpace.get(ColorSpace.Named.SRGB));
+    method public static inline operator int get(android.graphics.Bitmap, int x, int y);
+    method public static inline android.graphics.Bitmap scale(android.graphics.Bitmap, int width, int height, boolean filter = true);
+    method public static inline operator void set(android.graphics.Bitmap, int x, int y, @ColorInt int color);
   }
 
   public final class CanvasKt {
     ctor public CanvasKt();
-    method public static void withClip(android.graphics.Canvas, android.graphics.Rect clipRect, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withClip(android.graphics.Canvas, android.graphics.RectF clipRect, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withClip(android.graphics.Canvas, int left, int top, int right, int bottom, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withClip(android.graphics.Canvas, float left, float top, float right, float bottom, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withClip(android.graphics.Canvas, android.graphics.Path clipPath, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withMatrix(android.graphics.Canvas, android.graphics.Matrix matrix = android.graphics.Matrix(), kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withRotation(android.graphics.Canvas, float degrees = 0.0f, float pivotX = 0.0f, float pivotY = 0.0f, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withSave(android.graphics.Canvas, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withScale(android.graphics.Canvas, float x = 1.0f, float y = 1.0f, float pivotX = 0.0f, float pivotY = 0.0f, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withSkew(android.graphics.Canvas, float x = 0.0f, float y = 0.0f, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
-    method public static void withTranslation(android.graphics.Canvas, float x = 0.0f, float y = 0.0f, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withClip(android.graphics.Canvas, android.graphics.Rect clipRect, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withClip(android.graphics.Canvas, android.graphics.RectF clipRect, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withClip(android.graphics.Canvas, int left, int top, int right, int bottom, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withClip(android.graphics.Canvas, float left, float top, float right, float bottom, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withClip(android.graphics.Canvas, android.graphics.Path clipPath, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withMatrix(android.graphics.Canvas, android.graphics.Matrix matrix = android.graphics.Matrix(), kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withRotation(android.graphics.Canvas, float degrees = 0.0f, float pivotX = 0.0f, float pivotY = 0.0f, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withSave(android.graphics.Canvas, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withScale(android.graphics.Canvas, float x = 1.0f, float y = 1.0f, float pivotX = 0.0f, float pivotY = 0.0f, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withSkew(android.graphics.Canvas, float x = 0.0f, float y = 0.0f, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline void withTranslation(android.graphics.Canvas, float x = 0.0f, float y = 0.0f, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
   }
 
   public final class ColorKt {
     ctor public ColorKt();
-    method @RequiresApi(26) public static operator float component1(android.graphics.Color);
-    method public static operator int component1(int);
-    method @RequiresApi(26) public static operator float component1(long);
-    method @RequiresApi(26) public static operator float component2(android.graphics.Color);
-    method public static operator int component2(int);
-    method @RequiresApi(26) public static operator float component2(long);
-    method @RequiresApi(26) public static operator float component3(android.graphics.Color);
-    method public static operator int component3(int);
-    method @RequiresApi(26) public static operator float component3(long);
-    method @RequiresApi(26) public static operator float component4(android.graphics.Color);
-    method public static operator int component4(int);
-    method @RequiresApi(26) public static operator float component4(long);
-    method @RequiresApi(26) @ColorLong public static infix long convertTo(int, android.graphics.ColorSpace.Named colorSpace);
-    method @RequiresApi(26) @ColorLong public static infix long convertTo(int, android.graphics.ColorSpace colorSpace);
-    method @RequiresApi(26) @ColorLong public static infix long convertTo(long, android.graphics.ColorSpace.Named colorSpace);
-    method @RequiresApi(26) @ColorLong public static infix long convertTo(long, android.graphics.ColorSpace colorSpace);
-    method @RequiresApi(26) public static infix android.graphics.Color! convertTo(android.graphics.Color, android.graphics.ColorSpace.Named colorSpace);
-    method @RequiresApi(26) public static infix android.graphics.Color! convertTo(android.graphics.Color, android.graphics.ColorSpace colorSpace);
-    method public static int getAlpha(int);
-    method @RequiresApi(26) public static float getAlpha(long);
-    method public static int getBlue(int);
-    method @RequiresApi(26) public static float getBlue(long);
-    method @RequiresApi(26) public static android.graphics.ColorSpace getColorSpace(long);
-    method public static int getGreen(int);
-    method @RequiresApi(26) public static float getGreen(long);
-    method @RequiresApi(26) public static float getLuminance(int);
-    method @RequiresApi(26) public static float getLuminance(long);
-    method public static int getRed(int);
-    method @RequiresApi(26) public static float getRed(long);
-    method @RequiresApi(26) public static boolean isSrgb(long);
-    method @RequiresApi(26) public static boolean isWideGamut(long);
+    method @RequiresApi(26) public static inline operator float component1(android.graphics.Color);
+    method public static inline operator int component1(int);
+    method @RequiresApi(26) public static inline operator float component1(long);
+    method @RequiresApi(26) public static inline operator float component2(android.graphics.Color);
+    method public static inline operator int component2(int);
+    method @RequiresApi(26) public static inline operator float component2(long);
+    method @RequiresApi(26) public static inline operator float component3(android.graphics.Color);
+    method public static inline operator int component3(int);
+    method @RequiresApi(26) public static inline operator float component3(long);
+    method @RequiresApi(26) public static inline operator float component4(android.graphics.Color);
+    method public static inline operator int component4(int);
+    method @RequiresApi(26) public static inline operator float component4(long);
+    method @ColorLong @RequiresApi(26) public static inline infix long convertTo(int, android.graphics.ColorSpace.Named colorSpace);
+    method @ColorLong @RequiresApi(26) public static inline infix long convertTo(int, android.graphics.ColorSpace colorSpace);
+    method @ColorLong @RequiresApi(26) public static inline infix long convertTo(long, android.graphics.ColorSpace.Named colorSpace);
+    method @ColorLong @RequiresApi(26) public static inline infix long convertTo(long, android.graphics.ColorSpace colorSpace);
+    method @RequiresApi(26) public static inline infix android.graphics.Color! convertTo(android.graphics.Color, android.graphics.ColorSpace.Named colorSpace);
+    method @RequiresApi(26) public static inline infix android.graphics.Color! convertTo(android.graphics.Color, android.graphics.ColorSpace colorSpace);
+    method public static inline int getAlpha(int);
+    method @RequiresApi(26) public static inline float getAlpha(long);
+    method public static inline int getBlue(int);
+    method @RequiresApi(26) public static inline float getBlue(long);
+    method @RequiresApi(26) public static inline android.graphics.ColorSpace getColorSpace(long);
+    method public static inline int getGreen(int);
+    method @RequiresApi(26) public static inline float getGreen(long);
+    method @RequiresApi(26) public static inline float getLuminance(int);
+    method @RequiresApi(26) public static inline float getLuminance(long);
+    method public static inline int getRed(int);
+    method @RequiresApi(26) public static inline float getRed(long);
+    method @RequiresApi(26) public static inline boolean isSrgb(long);
+    method @RequiresApi(26) public static inline boolean isWideGamut(long);
     method @RequiresApi(26) public static operator android.graphics.Color plus(android.graphics.Color, android.graphics.Color c);
-    method @RequiresApi(26) public static android.graphics.Color toColor(int);
-    method @RequiresApi(26) public static android.graphics.Color toColor(long);
-    method @RequiresApi(26) @ColorInt public static int toColorInt(long);
-    method @ColorInt public static int toColorInt(String);
-    method @RequiresApi(26) @ColorLong public static long toColorLong(int);
+    method @RequiresApi(26) public static inline android.graphics.Color toColor(int);
+    method @RequiresApi(26) public static inline android.graphics.Color toColor(long);
+    method @ColorInt @RequiresApi(26) public static inline int toColorInt(long);
+    method @ColorInt public static inline int toColorInt(String);
+    method @ColorLong @RequiresApi(26) public static inline long toColorLong(int);
   }
 
   public final class ImageDecoderKt {
     ctor public ImageDecoderKt();
-    method @RequiresApi(28) public static android.graphics.Bitmap decodeBitmap(android.graphics.ImageDecoder.Source, kotlin.jvm.functions.Function3<? super android.graphics.ImageDecoder,? super android.graphics.ImageDecoder.ImageInfo,? super android.graphics.ImageDecoder.Source,kotlin.Unit> action);
-    method @RequiresApi(28) public static android.graphics.drawable.Drawable decodeDrawable(android.graphics.ImageDecoder.Source, kotlin.jvm.functions.Function3<? super android.graphics.ImageDecoder,? super android.graphics.ImageDecoder.ImageInfo,? super android.graphics.ImageDecoder.Source,kotlin.Unit> action);
+    method @RequiresApi(28) public static inline android.graphics.Bitmap decodeBitmap(android.graphics.ImageDecoder.Source, kotlin.jvm.functions.Function3<? super android.graphics.ImageDecoder,? super android.graphics.ImageDecoder.ImageInfo,? super android.graphics.ImageDecoder.Source,kotlin.Unit> action);
+    method @RequiresApi(28) public static inline android.graphics.drawable.Drawable decodeDrawable(android.graphics.ImageDecoder.Source, kotlin.jvm.functions.Function3<? super android.graphics.ImageDecoder,? super android.graphics.ImageDecoder.ImageInfo,? super android.graphics.ImageDecoder.Source,kotlin.Unit> action);
   }
 
   public final class MatrixKt {
     ctor public MatrixKt();
     method public static android.graphics.Matrix rotationMatrix(float degrees, float px = 0.0f, float py = 0.0f);
     method public static android.graphics.Matrix scaleMatrix(float sx = 1.0f, float sy = 1.0f);
-    method public static operator android.graphics.Matrix times(android.graphics.Matrix, android.graphics.Matrix m);
+    method public static inline operator android.graphics.Matrix times(android.graphics.Matrix, android.graphics.Matrix m);
     method public static android.graphics.Matrix translationMatrix(float tx = 0.0f, float ty = 0.0f);
-    method public static float[] values(android.graphics.Matrix);
+    method public static inline float[] values(android.graphics.Matrix);
   }
 
   public final class PathKt {
     ctor public PathKt();
-    method @RequiresApi(19) public static infix android.graphics.Path and(android.graphics.Path, android.graphics.Path p);
+    method @RequiresApi(19) public static inline infix android.graphics.Path and(android.graphics.Path, android.graphics.Path p);
     method @RequiresApi(26) public static Iterable<androidx.core.graphics.PathSegment> flatten(android.graphics.Path, float error = 0.5f);
-    method @RequiresApi(19) public static operator android.graphics.Path minus(android.graphics.Path, android.graphics.Path p);
-    method @RequiresApi(19) public static infix android.graphics.Path or(android.graphics.Path, android.graphics.Path p);
-    method @RequiresApi(19) public static operator android.graphics.Path plus(android.graphics.Path, android.graphics.Path p);
-    method @RequiresApi(19) public static infix android.graphics.Path xor(android.graphics.Path, android.graphics.Path p);
+    method @RequiresApi(19) public static inline operator android.graphics.Path minus(android.graphics.Path, android.graphics.Path p);
+    method @RequiresApi(19) public static inline infix android.graphics.Path or(android.graphics.Path, android.graphics.Path p);
+    method @RequiresApi(19) public static inline operator android.graphics.Path plus(android.graphics.Path, android.graphics.Path p);
+    method @RequiresApi(19) public static inline infix android.graphics.Path xor(android.graphics.Path, android.graphics.Path p);
   }
 
   public final class PictureKt {
     ctor public PictureKt();
-    method public static android.graphics.Picture record(android.graphics.Picture, int width, int height, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
+    method public static inline android.graphics.Picture record(android.graphics.Picture, int width, int height, kotlin.jvm.functions.Function1<? super android.graphics.Canvas,kotlin.Unit> block);
   }
 
   public final class PointKt {
     ctor public PointKt();
-    method public static operator int component1(android.graphics.Point);
-    method public static operator float component1(android.graphics.PointF);
-    method public static operator int component2(android.graphics.Point);
-    method public static operator float component2(android.graphics.PointF);
-    method public static operator android.graphics.Point minus(android.graphics.Point, android.graphics.Point p);
-    method public static operator android.graphics.PointF minus(android.graphics.PointF, android.graphics.PointF p);
-    method public static operator android.graphics.Point minus(android.graphics.Point, int xy);
-    method public static operator android.graphics.PointF minus(android.graphics.PointF, float xy);
-    method public static operator android.graphics.Point plus(android.graphics.Point, android.graphics.Point p);
-    method public static operator android.graphics.PointF plus(android.graphics.PointF, android.graphics.PointF p);
-    method public static operator android.graphics.Point plus(android.graphics.Point, int xy);
-    method public static operator android.graphics.PointF plus(android.graphics.PointF, float xy);
-    method public static android.graphics.Point toPoint(android.graphics.PointF);
-    method public static android.graphics.PointF toPointF(android.graphics.Point);
-    method public static operator android.graphics.Point unaryMinus(android.graphics.Point);
-    method public static operator android.graphics.PointF unaryMinus(android.graphics.PointF);
+    method public static inline operator int component1(android.graphics.Point);
+    method public static inline operator float component1(android.graphics.PointF);
+    method public static inline operator int component2(android.graphics.Point);
+    method public static inline operator float component2(android.graphics.PointF);
+    method public static inline operator android.graphics.Point minus(android.graphics.Point, android.graphics.Point p);
+    method public static inline operator android.graphics.PointF minus(android.graphics.PointF, android.graphics.PointF p);
+    method public static inline operator android.graphics.Point minus(android.graphics.Point, int xy);
+    method public static inline operator android.graphics.PointF minus(android.graphics.PointF, float xy);
+    method public static inline operator android.graphics.Point plus(android.graphics.Point, android.graphics.Point p);
+    method public static inline operator android.graphics.PointF plus(android.graphics.PointF, android.graphics.PointF p);
+    method public static inline operator android.graphics.Point plus(android.graphics.Point, int xy);
+    method public static inline operator android.graphics.PointF plus(android.graphics.PointF, float xy);
+    method public static inline android.graphics.Point toPoint(android.graphics.PointF);
+    method public static inline android.graphics.PointF toPointF(android.graphics.Point);
+    method public static inline operator android.graphics.Point unaryMinus(android.graphics.Point);
+    method public static inline operator android.graphics.PointF unaryMinus(android.graphics.PointF);
   }
 
   public final class PorterDuffKt {
     ctor public PorterDuffKt();
-    method public static android.graphics.PorterDuffColorFilter toColorFilter(android.graphics.PorterDuff.Mode, int color);
-    method public static android.graphics.PorterDuffXfermode toXfermode(android.graphics.PorterDuff.Mode);
+    method public static inline android.graphics.PorterDuffColorFilter toColorFilter(android.graphics.PorterDuff.Mode, int color);
+    method public static inline android.graphics.PorterDuffXfermode toXfermode(android.graphics.PorterDuff.Mode);
   }
 
   public final class RectKt {
     ctor public RectKt();
-    method public static infix android.graphics.Rect and(android.graphics.Rect, android.graphics.Rect r);
-    method public static infix android.graphics.RectF and(android.graphics.RectF, android.graphics.RectF r);
-    method public static operator int component1(android.graphics.Rect);
-    method public static operator float component1(android.graphics.RectF);
-    method public static operator int component2(android.graphics.Rect);
-    method public static operator float component2(android.graphics.RectF);
-    method public static operator int component3(android.graphics.Rect);
-    method public static operator float component3(android.graphics.RectF);
-    method public static operator int component4(android.graphics.Rect);
-    method public static operator float component4(android.graphics.RectF);
-    method public static operator boolean contains(android.graphics.Rect, android.graphics.Point p);
-    method public static operator boolean contains(android.graphics.RectF, android.graphics.PointF p);
-    method public static operator android.graphics.Region minus(android.graphics.Rect, android.graphics.Rect r);
-    method public static operator android.graphics.Region minus(android.graphics.RectF, android.graphics.RectF r);
-    method public static operator android.graphics.Rect minus(android.graphics.Rect, int xy);
-    method public static operator android.graphics.RectF minus(android.graphics.RectF, float xy);
-    method public static operator android.graphics.Rect minus(android.graphics.Rect, android.graphics.Point xy);
-    method public static operator android.graphics.RectF minus(android.graphics.RectF, android.graphics.PointF xy);
-    method public static infix android.graphics.Rect or(android.graphics.Rect, android.graphics.Rect r);
-    method public static infix android.graphics.RectF or(android.graphics.RectF, android.graphics.RectF r);
-    method public static operator android.graphics.Rect plus(android.graphics.Rect, android.graphics.Rect r);
-    method public static operator android.graphics.RectF plus(android.graphics.RectF, android.graphics.RectF r);
-    method public static operator android.graphics.Rect plus(android.graphics.Rect, int xy);
-    method public static operator android.graphics.RectF plus(android.graphics.RectF, float xy);
-    method public static operator android.graphics.Rect plus(android.graphics.Rect, android.graphics.Point xy);
-    method public static operator android.graphics.RectF plus(android.graphics.RectF, android.graphics.PointF xy);
-    method public static android.graphics.Rect toRect(android.graphics.RectF);
-    method public static android.graphics.RectF toRectF(android.graphics.Rect);
-    method public static android.graphics.Region toRegion(android.graphics.Rect);
-    method public static android.graphics.Region toRegion(android.graphics.RectF);
-    method public static android.graphics.RectF transform(android.graphics.RectF, android.graphics.Matrix m);
-    method public static infix android.graphics.Region xor(android.graphics.Rect, android.graphics.Rect r);
-    method public static infix android.graphics.Region xor(android.graphics.RectF, android.graphics.RectF r);
+    method public static inline infix android.graphics.Rect and(android.graphics.Rect, android.graphics.Rect r);
+    method public static inline infix android.graphics.RectF and(android.graphics.RectF, android.graphics.RectF r);
+    method public static inline operator int component1(android.graphics.Rect);
+    method public static inline operator float component1(android.graphics.RectF);
+    method public static inline operator int component2(android.graphics.Rect);
+    method public static inline operator float component2(android.graphics.RectF);
+    method public static inline operator int component3(android.graphics.Rect);
+    method public static inline operator float component3(android.graphics.RectF);
+    method public static inline operator int component4(android.graphics.Rect);
+    method public static inline operator float component4(android.graphics.RectF);
+    method public static inline operator boolean contains(android.graphics.Rect, android.graphics.Point p);
+    method public static inline operator boolean contains(android.graphics.RectF, android.graphics.PointF p);
+    method public static inline operator android.graphics.Region minus(android.graphics.Rect, android.graphics.Rect r);
+    method public static inline operator android.graphics.Region minus(android.graphics.RectF, android.graphics.RectF r);
+    method public static inline operator android.graphics.Rect minus(android.graphics.Rect, int xy);
+    method public static inline operator android.graphics.RectF minus(android.graphics.RectF, float xy);
+    method public static inline operator android.graphics.Rect minus(android.graphics.Rect, android.graphics.Point xy);
+    method public static inline operator android.graphics.RectF minus(android.graphics.RectF, android.graphics.PointF xy);
+    method public static inline infix android.graphics.Rect or(android.graphics.Rect, android.graphics.Rect r);
+    method public static inline infix android.graphics.RectF or(android.graphics.RectF, android.graphics.RectF r);
+    method public static inline operator android.graphics.Rect plus(android.graphics.Rect, android.graphics.Rect r);
+    method public static inline operator android.graphics.RectF plus(android.graphics.RectF, android.graphics.RectF r);
+    method public static inline operator android.graphics.Rect plus(android.graphics.Rect, int xy);
+    method public static inline operator android.graphics.RectF plus(android.graphics.RectF, float xy);
+    method public static inline operator android.graphics.Rect plus(android.graphics.Rect, android.graphics.Point xy);
+    method public static inline operator android.graphics.RectF plus(android.graphics.RectF, android.graphics.PointF xy);
+    method public static inline android.graphics.Rect toRect(android.graphics.RectF);
+    method public static inline android.graphics.RectF toRectF(android.graphics.Rect);
+    method public static inline android.graphics.Region toRegion(android.graphics.Rect);
+    method public static inline android.graphics.Region toRegion(android.graphics.RectF);
+    method public static inline android.graphics.RectF transform(android.graphics.RectF, android.graphics.Matrix m);
+    method public static inline infix android.graphics.Region xor(android.graphics.Rect, android.graphics.Rect r);
+    method public static inline infix android.graphics.Region xor(android.graphics.RectF, android.graphics.RectF r);
   }
 
   public final class RegionKt {
     ctor public RegionKt();
-    method public static infix android.graphics.Region and(android.graphics.Region, android.graphics.Rect r);
-    method public static infix android.graphics.Region and(android.graphics.Region, android.graphics.Region r);
-    method public static operator boolean contains(android.graphics.Region, android.graphics.Point p);
-    method public static void forEach(android.graphics.Region, kotlin.jvm.functions.Function1<? super android.graphics.Rect,kotlin.Unit> action);
+    method public static inline infix android.graphics.Region and(android.graphics.Region, android.graphics.Rect r);
+    method public static inline infix android.graphics.Region and(android.graphics.Region, android.graphics.Region r);
+    method public static inline operator boolean contains(android.graphics.Region, android.graphics.Point p);
+    method public static inline void forEach(android.graphics.Region, kotlin.jvm.functions.Function1<? super android.graphics.Rect,kotlin.Unit> action);
     method public static operator java.util.Iterator<android.graphics.Rect> iterator(android.graphics.Region);
-    method public static operator android.graphics.Region minus(android.graphics.Region, android.graphics.Rect r);
-    method public static operator android.graphics.Region minus(android.graphics.Region, android.graphics.Region r);
-    method public static operator android.graphics.Region not(android.graphics.Region);
-    method public static infix android.graphics.Region or(android.graphics.Region, android.graphics.Rect r);
-    method public static infix android.graphics.Region or(android.graphics.Region, android.graphics.Region r);
-    method public static operator android.graphics.Region plus(android.graphics.Region, android.graphics.Rect r);
-    method public static operator android.graphics.Region plus(android.graphics.Region, android.graphics.Region r);
-    method public static operator android.graphics.Region unaryMinus(android.graphics.Region);
-    method public static infix android.graphics.Region xor(android.graphics.Region, android.graphics.Rect r);
-    method public static infix android.graphics.Region xor(android.graphics.Region, android.graphics.Region r);
+    method public static inline operator android.graphics.Region minus(android.graphics.Region, android.graphics.Rect r);
+    method public static inline operator android.graphics.Region minus(android.graphics.Region, android.graphics.Region r);
+    method public static inline operator android.graphics.Region not(android.graphics.Region);
+    method public static inline infix android.graphics.Region or(android.graphics.Region, android.graphics.Rect r);
+    method public static inline infix android.graphics.Region or(android.graphics.Region, android.graphics.Region r);
+    method public static inline operator android.graphics.Region plus(android.graphics.Region, android.graphics.Rect r);
+    method public static inline operator android.graphics.Region plus(android.graphics.Region, android.graphics.Region r);
+    method public static inline operator android.graphics.Region unaryMinus(android.graphics.Region);
+    method public static inline infix android.graphics.Region xor(android.graphics.Region, android.graphics.Rect r);
+    method public static inline infix android.graphics.Region xor(android.graphics.Region, android.graphics.Region r);
   }
 
   public final class ShaderKt {
     ctor public ShaderKt();
-    method public static void transform(android.graphics.Shader, kotlin.jvm.functions.Function1<? super android.graphics.Matrix,kotlin.Unit> block);
+    method public static inline void transform(android.graphics.Shader, kotlin.jvm.functions.Function1<? super android.graphics.Matrix,kotlin.Unit> block);
   }
 
 }
@@ -276,13 +277,13 @@
 
   public final class BitmapDrawableKt {
     ctor public BitmapDrawableKt();
-    method public static android.graphics.drawable.BitmapDrawable toDrawable(android.graphics.Bitmap, android.content.res.Resources resources);
+    method public static inline android.graphics.drawable.BitmapDrawable toDrawable(android.graphics.Bitmap, android.content.res.Resources resources);
   }
 
   public final class ColorDrawableKt {
     ctor public ColorDrawableKt();
-    method public static android.graphics.drawable.ColorDrawable toDrawable(int);
-    method @RequiresApi(26) public static android.graphics.drawable.ColorDrawable toDrawable(android.graphics.Color);
+    method public static inline android.graphics.drawable.ColorDrawable toDrawable(int);
+    method @RequiresApi(26) public static inline android.graphics.drawable.ColorDrawable toDrawable(android.graphics.Color);
   }
 
   public final class DrawableKt {
@@ -293,10 +294,10 @@
 
   public final class IconKt {
     ctor public IconKt();
-    method @RequiresApi(26) public static android.graphics.drawable.Icon toAdaptiveIcon(android.graphics.Bitmap);
-    method @RequiresApi(26) public static android.graphics.drawable.Icon toIcon(android.graphics.Bitmap);
-    method @RequiresApi(26) public static android.graphics.drawable.Icon toIcon(android.net.Uri);
-    method @RequiresApi(26) public static android.graphics.drawable.Icon toIcon(byte[]);
+    method @RequiresApi(26) public static inline android.graphics.drawable.Icon toAdaptiveIcon(android.graphics.Bitmap);
+    method @RequiresApi(26) public static inline android.graphics.drawable.Icon toIcon(android.graphics.Bitmap);
+    method @RequiresApi(26) public static inline android.graphics.drawable.Icon toIcon(android.net.Uri);
+    method @RequiresApi(26) public static inline android.graphics.drawable.Icon toIcon(byte[]);
   }
 
 }
@@ -305,8 +306,8 @@
 
   public final class LocationKt {
     ctor public LocationKt();
-    method public static operator double component1(android.location.Location);
-    method public static operator double component2(android.location.Location);
+    method public static inline operator double component1(android.location.Location);
+    method public static inline operator double component2(android.location.Location);
   }
 
 }
@@ -316,8 +317,8 @@
   public final class UriKt {
     ctor public UriKt();
     method public static java.io.File toFile(android.net.Uri);
-    method public static android.net.Uri toUri(String);
-    method public static android.net.Uri toUri(java.io.File);
+    method public static inline android.net.Uri toUri(String);
+    method public static inline android.net.Uri toUri(java.io.File);
   }
 
 }
@@ -331,8 +332,8 @@
 
   public final class HandlerKt {
     ctor public HandlerKt();
-    method public static Runnable postAtTime(android.os.Handler, long uptimeMillis, Object? token = null, kotlin.jvm.functions.Function0<kotlin.Unit> action);
-    method public static Runnable postDelayed(android.os.Handler, long delayInMillis, Object? token = null, kotlin.jvm.functions.Function0<kotlin.Unit> action);
+    method public static inline Runnable postAtTime(android.os.Handler, long uptimeMillis, Object? token = null, kotlin.jvm.functions.Function0<kotlin.Unit> action);
+    method public static inline Runnable postDelayed(android.os.Handler, long delayInMillis, Object? token = null, kotlin.jvm.functions.Function0<kotlin.Unit> action);
   }
 
   public final class PersistableBundleKt {
@@ -342,7 +343,7 @@
 
   public final class TraceKt {
     ctor public TraceKt();
-    method public static <T> T! trace(String sectionName, kotlin.jvm.functions.Function0<? extends T> block);
+    method public static inline <T> T! trace(String sectionName, kotlin.jvm.functions.Function0<? extends T> block);
   }
 
 }
@@ -351,53 +352,54 @@
 
   public final class CharSequenceKt {
     ctor public CharSequenceKt();
-    method public static boolean isDigitsOnly(CharSequence);
-    method public static int trimmedLength(CharSequence);
+    method public static inline boolean isDigitsOnly(CharSequence);
+    method public static inline int trimmedLength(CharSequence);
   }
 
   public final class HtmlKt {
     ctor public HtmlKt();
-    method public static android.text.Spanned parseAsHtml(String, int flags = 0, android.text.Html.ImageGetter? imageGetter = null, android.text.Html.TagHandler? tagHandler = null);
-    method public static String toHtml(android.text.Spanned, int option = 0);
+    method public static inline android.text.Spanned parseAsHtml(String, int flags = 0, android.text.Html.ImageGetter? imageGetter = null, android.text.Html.TagHandler? tagHandler = null);
+    method public static inline String toHtml(android.text.Spanned, int option = 0);
   }
 
   public final class LocaleKt {
     ctor public LocaleKt();
-    method @RequiresApi(17) public static int getLayoutDirection(java.util.Locale);
+    method @RequiresApi(17) public static inline int getLayoutDirection(java.util.Locale);
   }
 
   public final class SpannableStringBuilderKt {
     ctor public SpannableStringBuilderKt();
-    method public static android.text.SpannableStringBuilder backgroundColor(android.text.SpannableStringBuilder, @ColorInt int color, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder bold(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannedString buildSpannedString(kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder color(android.text.SpannableStringBuilder, @ColorInt int color, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder inSpans(android.text.SpannableStringBuilder, Object[] spans, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder inSpans(android.text.SpannableStringBuilder, Object span, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder italic(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder scale(android.text.SpannableStringBuilder, float proportion, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder strikeThrough(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder subscript(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder superscript(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
-    method public static android.text.SpannableStringBuilder underline(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder backgroundColor(android.text.SpannableStringBuilder, @ColorInt int color, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder bold(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannedString buildSpannedString(kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder color(android.text.SpannableStringBuilder, @ColorInt int color, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder inSpans(android.text.SpannableStringBuilder, Object[] spans, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder inSpans(android.text.SpannableStringBuilder, Object span, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder italic(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder scale(android.text.SpannableStringBuilder, float proportion, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder strikeThrough(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder subscript(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder superscript(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
+    method public static inline android.text.SpannableStringBuilder underline(android.text.SpannableStringBuilder, kotlin.jvm.functions.Function1<? super android.text.SpannableStringBuilder,kotlin.Unit> builderAction);
   }
 
   public final class SpannableStringKt {
     ctor public SpannableStringKt();
-    method public static void clearSpans(android.text.Spannable);
-    method public static operator void set(android.text.Spannable, int start, int end, Object span);
-    method public static operator void set(android.text.Spannable, kotlin.ranges.IntRange range, Object span);
-    method public static android.text.Spannable toSpannable(CharSequence);
+    method public static inline void clearSpans(android.text.Spannable);
+    method public static inline operator void set(android.text.Spannable, int start, int end, Object span);
+    method public static inline operator void set(android.text.Spannable, kotlin.ranges.IntRange range, Object span);
+    method public static inline android.text.Spannable toSpannable(CharSequence);
   }
 
   public final class SpannedStringKt {
     ctor public SpannedStringKt();
-    method public static android.text.Spanned toSpanned(CharSequence);
+    method public static inline <reified T> T[]! getSpans(android.text.Spanned, int start = 0, int end = length);
+    method public static inline android.text.Spanned toSpanned(CharSequence);
   }
 
   public final class StringKt {
     ctor public StringKt();
-    method public static String htmlEncode(String);
+    method public static inline String htmlEncode(String);
   }
 
 }
@@ -406,12 +408,12 @@
 
   public final class TransitionKt {
     ctor public TransitionKt();
-    method @RequiresApi(19) public static android.transition.Transition.TransitionListener addListener(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onEnd = {}, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onStart = {}, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onCancel = {}, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onResume = {}, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onPause = {});
-    method @RequiresApi(19) public static android.transition.Transition.TransitionListener doOnCancel(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
-    method @RequiresApi(19) public static android.transition.Transition.TransitionListener doOnEnd(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
-    method @RequiresApi(19) public static android.transition.Transition.TransitionListener doOnPause(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
-    method @RequiresApi(19) public static android.transition.Transition.TransitionListener doOnResume(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
-    method @RequiresApi(19) public static android.transition.Transition.TransitionListener doOnStart(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
+    method @RequiresApi(19) public static inline android.transition.Transition.TransitionListener addListener(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onEnd = {}, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onStart = {}, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onCancel = {}, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onResume = {}, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> onPause = {});
+    method @RequiresApi(19) public static inline android.transition.Transition.TransitionListener doOnCancel(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
+    method @RequiresApi(19) public static inline android.transition.Transition.TransitionListener doOnEnd(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
+    method @RequiresApi(19) public static inline android.transition.Transition.TransitionListener doOnPause(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
+    method @RequiresApi(19) public static inline android.transition.Transition.TransitionListener doOnResume(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
+    method @RequiresApi(19) public static inline android.transition.Transition.TransitionListener doOnStart(android.transition.Transition, kotlin.jvm.functions.Function1<? super android.transition.Transition,kotlin.Unit> action);
   }
 
 }
@@ -420,144 +422,144 @@
 
   public final class AtomicFileKt {
     ctor public AtomicFileKt();
-    method @RequiresApi(17) public static byte[] readBytes(android.util.AtomicFile);
+    method @RequiresApi(17) public static inline byte[] readBytes(android.util.AtomicFile);
     method @RequiresApi(17) public static String readText(android.util.AtomicFile, java.nio.charset.Charset charset = Charsets.UTF_8);
-    method @RequiresApi(17) public static void tryWrite(android.util.AtomicFile, kotlin.jvm.functions.Function1<? super java.io.FileOutputStream,kotlin.Unit> block);
+    method @RequiresApi(17) public static inline void tryWrite(android.util.AtomicFile, kotlin.jvm.functions.Function1<? super java.io.FileOutputStream,kotlin.Unit> block);
     method @RequiresApi(17) public static void writeBytes(android.util.AtomicFile, byte[] array);
     method @RequiresApi(17) public static void writeText(android.util.AtomicFile, String text, java.nio.charset.Charset charset = Charsets.UTF_8);
   }
 
   public final class HalfKt {
     ctor public HalfKt();
-    method @RequiresApi(26) public static android.util.Half toHalf(short);
-    method @RequiresApi(26) public static android.util.Half toHalf(float);
-    method @RequiresApi(26) public static android.util.Half toHalf(double);
-    method @RequiresApi(26) public static android.util.Half toHalf(String);
+    method @RequiresApi(26) public static inline android.util.Half toHalf(short);
+    method @RequiresApi(26) public static inline android.util.Half toHalf(float);
+    method @RequiresApi(26) public static inline android.util.Half toHalf(double);
+    method @RequiresApi(26) public static inline android.util.Half toHalf(String);
   }
 
   public final class LongSparseArrayKt {
     ctor public LongSparseArrayKt();
-    method @RequiresApi(16) public static operator <T> boolean contains(android.util.LongSparseArray<T>, long key);
-    method @RequiresApi(16) public static <T> boolean containsKey(android.util.LongSparseArray<T>, long key);
-    method @RequiresApi(16) public static <T> boolean containsValue(android.util.LongSparseArray<T>, T! value);
-    method @RequiresApi(16) public static <T> void forEach(android.util.LongSparseArray<T>, kotlin.jvm.functions.Function2<? super java.lang.Long,? super T,kotlin.Unit> action);
-    method @RequiresApi(16) public static <T> T! getOrDefault(android.util.LongSparseArray<T>, long key, T! defaultValue);
-    method @RequiresApi(16) public static <T> T! getOrElse(android.util.LongSparseArray<T>, long key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
-    method @RequiresApi(16) public static <T> int getSize(android.util.LongSparseArray<T>);
-    method @RequiresApi(16) public static <T> boolean isEmpty(android.util.LongSparseArray<T>);
-    method @RequiresApi(16) public static <T> boolean isNotEmpty(android.util.LongSparseArray<T>);
+    method @RequiresApi(16) public static inline operator <T> boolean contains(android.util.LongSparseArray<T>, long key);
+    method @RequiresApi(16) public static inline <T> boolean containsKey(android.util.LongSparseArray<T>, long key);
+    method @RequiresApi(16) public static inline <T> boolean containsValue(android.util.LongSparseArray<T>, T! value);
+    method @RequiresApi(16) public static inline <T> void forEach(android.util.LongSparseArray<T>, kotlin.jvm.functions.Function2<? super java.lang.Long,? super T,kotlin.Unit> action);
+    method @RequiresApi(16) public static inline <T> T! getOrDefault(android.util.LongSparseArray<T>, long key, T! defaultValue);
+    method @RequiresApi(16) public static inline <T> T! getOrElse(android.util.LongSparseArray<T>, long key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method @RequiresApi(16) public static inline <T> int getSize(android.util.LongSparseArray<T>);
+    method @RequiresApi(16) public static inline <T> boolean isEmpty(android.util.LongSparseArray<T>);
+    method @RequiresApi(16) public static inline <T> boolean isNotEmpty(android.util.LongSparseArray<T>);
     method @RequiresApi(16) public static <T> kotlin.collections.LongIterator keyIterator(android.util.LongSparseArray<T>);
     method @RequiresApi(16) public static operator <T> android.util.LongSparseArray<T> plus(android.util.LongSparseArray<T>, android.util.LongSparseArray<T> other);
     method @RequiresApi(16) public static <T> void putAll(android.util.LongSparseArray<T>, android.util.LongSparseArray<T> other);
     method @RequiresApi(16) public static <T> boolean remove(android.util.LongSparseArray<T>, long key, T! value);
-    method @RequiresApi(16) public static operator <T> void set(android.util.LongSparseArray<T>, long key, T! value);
+    method @RequiresApi(16) public static inline operator <T> void set(android.util.LongSparseArray<T>, long key, T! value);
     method @RequiresApi(16) public static <T> java.util.Iterator<T> valueIterator(android.util.LongSparseArray<T>);
   }
 
   public final class LruCacheKt {
     ctor public LruCacheKt();
-    method public static <K, V> android.util.LruCache<K,V> lruCache(int maxSize, kotlin.jvm.functions.Function2<? super K,? super V,java.lang.Integer> sizeOf = { _, _ -> 1 }, kotlin.jvm.functions.Function1<? super K,? extends V> create = { (V)null }, kotlin.jvm.functions.Function4<? super java.lang.Boolean,? super K,? super V,? super V,kotlin.Unit> onEntryRemoved = { _, _, _, _ ->  });
+    method public static inline <K, V> android.util.LruCache<K,V> lruCache(int maxSize, kotlin.jvm.functions.Function2<? super K,? super V,java.lang.Integer> sizeOf = { _, _ -> 1 }, kotlin.jvm.functions.Function1<? super K,? extends V> create = { (V)null }, kotlin.jvm.functions.Function4<? super java.lang.Boolean,? super K,? super V,? super V,kotlin.Unit> onEntryRemoved = { _, _, _, _ ->  });
   }
 
   public final class PairKt {
     ctor public PairKt();
-    method public static operator <F, S> F! component1(android.util.Pair<F,S>);
-    method public static operator <F, S> S! component2(android.util.Pair<F,S>);
-    method public static <F, S> android.util.Pair<F,S> toAndroidPair(kotlin.Pair<? extends F,? extends S>);
-    method public static <F, S> kotlin.Pair<F,S> toKotlinPair(android.util.Pair<F,S>);
+    method public static inline operator <F, S> F! component1(android.util.Pair<F,S>);
+    method public static inline operator <F, S> S! component2(android.util.Pair<F,S>);
+    method public static inline <F, S> android.util.Pair<F,S> toAndroidPair(kotlin.Pair<? extends F,? extends S>);
+    method public static inline <F, S> kotlin.Pair<F,S> toKotlinPair(android.util.Pair<F,S>);
   }
 
   public final class RangeKt {
     ctor public RangeKt();
-    method @RequiresApi(21) public static infix <T extends java.lang.Comparable<? super T>> android.util.Range<T> and(android.util.Range<T>, android.util.Range<T> other);
-    method @RequiresApi(21) public static operator <T extends java.lang.Comparable<? super T>> android.util.Range<T> plus(android.util.Range<T>, T value);
-    method @RequiresApi(21) public static operator <T extends java.lang.Comparable<? super T>> android.util.Range<T> plus(android.util.Range<T>, android.util.Range<T> other);
-    method @RequiresApi(21) public static infix <T extends java.lang.Comparable<? super T>> android.util.Range<T> rangeTo(T, T that);
+    method @RequiresApi(21) public static inline infix <T extends java.lang.Comparable<? super T>> android.util.Range<T> and(android.util.Range<T>, android.util.Range<T> other);
+    method @RequiresApi(21) public static inline operator <T extends java.lang.Comparable<? super T>> android.util.Range<T> plus(android.util.Range<T>, T value);
+    method @RequiresApi(21) public static inline operator <T extends java.lang.Comparable<? super T>> android.util.Range<T> plus(android.util.Range<T>, android.util.Range<T> other);
+    method @RequiresApi(21) public static inline infix <T extends java.lang.Comparable<? super T>> android.util.Range<T> rangeTo(T, T that);
     method @RequiresApi(21) public static <T extends java.lang.Comparable<? super T>> kotlin.ranges.ClosedRange<T> toClosedRange(android.util.Range<T>);
     method @RequiresApi(21) public static <T extends java.lang.Comparable<? super T>> android.util.Range<T> toRange(kotlin.ranges.ClosedRange<T>);
   }
 
   public final class SizeKt {
     ctor public SizeKt();
-    method @RequiresApi(21) public static operator int component1(android.util.Size);
-    method @RequiresApi(21) public static operator float component1(android.util.SizeF);
-    method @RequiresApi(21) public static operator int component2(android.util.Size);
-    method @RequiresApi(21) public static operator float component2(android.util.SizeF);
+    method @RequiresApi(21) public static inline operator int component1(android.util.Size);
+    method @RequiresApi(21) public static inline operator float component1(android.util.SizeF);
+    method @RequiresApi(21) public static inline operator int component2(android.util.Size);
+    method @RequiresApi(21) public static inline operator float component2(android.util.SizeF);
   }
 
   public final class SparseArrayKt {
     ctor public SparseArrayKt();
-    method public static operator <T> boolean contains(android.util.SparseArray<T>, int key);
-    method public static <T> boolean containsKey(android.util.SparseArray<T>, int key);
-    method public static <T> boolean containsValue(android.util.SparseArray<T>, T! value);
-    method public static <T> void forEach(android.util.SparseArray<T>, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> action);
-    method public static <T> T! getOrDefault(android.util.SparseArray<T>, int key, T! defaultValue);
-    method public static <T> T! getOrElse(android.util.SparseArray<T>, int key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
-    method public static <T> int getSize(android.util.SparseArray<T>);
-    method public static <T> boolean isEmpty(android.util.SparseArray<T>);
-    method public static <T> boolean isNotEmpty(android.util.SparseArray<T>);
+    method public static inline operator <T> boolean contains(android.util.SparseArray<T>, int key);
+    method public static inline <T> boolean containsKey(android.util.SparseArray<T>, int key);
+    method public static inline <T> boolean containsValue(android.util.SparseArray<T>, T! value);
+    method public static inline <T> void forEach(android.util.SparseArray<T>, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super T,kotlin.Unit> action);
+    method public static inline <T> T! getOrDefault(android.util.SparseArray<T>, int key, T! defaultValue);
+    method public static inline <T> T! getOrElse(android.util.SparseArray<T>, int key, kotlin.jvm.functions.Function0<? extends T> defaultValue);
+    method public static inline <T> int getSize(android.util.SparseArray<T>);
+    method public static inline <T> boolean isEmpty(android.util.SparseArray<T>);
+    method public static inline <T> boolean isNotEmpty(android.util.SparseArray<T>);
     method public static <T> kotlin.collections.IntIterator keyIterator(android.util.SparseArray<T>);
     method public static operator <T> android.util.SparseArray<T> plus(android.util.SparseArray<T>, android.util.SparseArray<T> other);
     method public static <T> void putAll(android.util.SparseArray<T>, android.util.SparseArray<T> other);
     method public static <T> boolean remove(android.util.SparseArray<T>, int key, T! value);
-    method public static operator <T> void set(android.util.SparseArray<T>, int key, T! value);
+    method public static inline operator <T> void set(android.util.SparseArray<T>, int key, T! value);
     method public static <T> java.util.Iterator<T> valueIterator(android.util.SparseArray<T>);
   }
 
   public final class SparseBooleanArrayKt {
     ctor public SparseBooleanArrayKt();
-    method public static operator boolean contains(android.util.SparseBooleanArray, int key);
-    method public static boolean containsKey(android.util.SparseBooleanArray, int key);
-    method public static boolean containsValue(android.util.SparseBooleanArray, boolean value);
-    method public static void forEach(android.util.SparseBooleanArray, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Boolean,kotlin.Unit> action);
-    method public static boolean getOrDefault(android.util.SparseBooleanArray, int key, boolean defaultValue);
-    method public static boolean getOrElse(android.util.SparseBooleanArray, int key, kotlin.jvm.functions.Function0<java.lang.Boolean> defaultValue);
-    method public static int getSize(android.util.SparseBooleanArray);
-    method public static boolean isEmpty(android.util.SparseBooleanArray);
-    method public static boolean isNotEmpty(android.util.SparseBooleanArray);
+    method public static inline operator boolean contains(android.util.SparseBooleanArray, int key);
+    method public static inline boolean containsKey(android.util.SparseBooleanArray, int key);
+    method public static inline boolean containsValue(android.util.SparseBooleanArray, boolean value);
+    method public static inline void forEach(android.util.SparseBooleanArray, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Boolean,kotlin.Unit> action);
+    method public static inline boolean getOrDefault(android.util.SparseBooleanArray, int key, boolean defaultValue);
+    method public static inline boolean getOrElse(android.util.SparseBooleanArray, int key, kotlin.jvm.functions.Function0<java.lang.Boolean> defaultValue);
+    method public static inline int getSize(android.util.SparseBooleanArray);
+    method public static inline boolean isEmpty(android.util.SparseBooleanArray);
+    method public static inline boolean isNotEmpty(android.util.SparseBooleanArray);
     method public static kotlin.collections.IntIterator keyIterator(android.util.SparseBooleanArray);
     method public static operator android.util.SparseBooleanArray plus(android.util.SparseBooleanArray, android.util.SparseBooleanArray other);
     method public static void putAll(android.util.SparseBooleanArray, android.util.SparseBooleanArray other);
     method public static boolean remove(android.util.SparseBooleanArray, int key, boolean value);
-    method public static operator void set(android.util.SparseBooleanArray, int key, boolean value);
+    method public static inline operator void set(android.util.SparseBooleanArray, int key, boolean value);
     method public static kotlin.collections.BooleanIterator valueIterator(android.util.SparseBooleanArray);
   }
 
   public final class SparseIntArrayKt {
     ctor public SparseIntArrayKt();
-    method public static operator boolean contains(android.util.SparseIntArray, int key);
-    method public static boolean containsKey(android.util.SparseIntArray, int key);
-    method public static boolean containsValue(android.util.SparseIntArray, int value);
-    method public static void forEach(android.util.SparseIntArray, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> action);
-    method public static int getOrDefault(android.util.SparseIntArray, int key, int defaultValue);
-    method public static int getOrElse(android.util.SparseIntArray, int key, kotlin.jvm.functions.Function0<java.lang.Integer> defaultValue);
-    method public static int getSize(android.util.SparseIntArray);
-    method public static boolean isEmpty(android.util.SparseIntArray);
-    method public static boolean isNotEmpty(android.util.SparseIntArray);
+    method public static inline operator boolean contains(android.util.SparseIntArray, int key);
+    method public static inline boolean containsKey(android.util.SparseIntArray, int key);
+    method public static inline boolean containsValue(android.util.SparseIntArray, int value);
+    method public static inline void forEach(android.util.SparseIntArray, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> action);
+    method public static inline int getOrDefault(android.util.SparseIntArray, int key, int defaultValue);
+    method public static inline int getOrElse(android.util.SparseIntArray, int key, kotlin.jvm.functions.Function0<java.lang.Integer> defaultValue);
+    method public static inline int getSize(android.util.SparseIntArray);
+    method public static inline boolean isEmpty(android.util.SparseIntArray);
+    method public static inline boolean isNotEmpty(android.util.SparseIntArray);
     method public static kotlin.collections.IntIterator keyIterator(android.util.SparseIntArray);
     method public static operator android.util.SparseIntArray plus(android.util.SparseIntArray, android.util.SparseIntArray other);
     method public static void putAll(android.util.SparseIntArray, android.util.SparseIntArray other);
     method public static boolean remove(android.util.SparseIntArray, int key, int value);
-    method public static operator void set(android.util.SparseIntArray, int key, int value);
+    method public static inline operator void set(android.util.SparseIntArray, int key, int value);
     method public static kotlin.collections.IntIterator valueIterator(android.util.SparseIntArray);
   }
 
   public final class SparseLongArrayKt {
     ctor public SparseLongArrayKt();
-    method @RequiresApi(18) public static operator boolean contains(android.util.SparseLongArray, int key);
-    method @RequiresApi(18) public static boolean containsKey(android.util.SparseLongArray, int key);
-    method @RequiresApi(18) public static boolean containsValue(android.util.SparseLongArray, long value);
-    method @RequiresApi(18) public static void forEach(android.util.SparseLongArray, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Long,kotlin.Unit> action);
-    method @RequiresApi(18) public static long getOrDefault(android.util.SparseLongArray, int key, long defaultValue);
-    method @RequiresApi(18) public static long getOrElse(android.util.SparseLongArray, int key, kotlin.jvm.functions.Function0<java.lang.Long> defaultValue);
-    method @RequiresApi(18) public static int getSize(android.util.SparseLongArray);
-    method @RequiresApi(18) public static boolean isEmpty(android.util.SparseLongArray);
-    method @RequiresApi(18) public static boolean isNotEmpty(android.util.SparseLongArray);
+    method @RequiresApi(18) public static inline operator boolean contains(android.util.SparseLongArray, int key);
+    method @RequiresApi(18) public static inline boolean containsKey(android.util.SparseLongArray, int key);
+    method @RequiresApi(18) public static inline boolean containsValue(android.util.SparseLongArray, long value);
+    method @RequiresApi(18) public static inline void forEach(android.util.SparseLongArray, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super java.lang.Long,kotlin.Unit> action);
+    method @RequiresApi(18) public static inline long getOrDefault(android.util.SparseLongArray, int key, long defaultValue);
+    method @RequiresApi(18) public static inline long getOrElse(android.util.SparseLongArray, int key, kotlin.jvm.functions.Function0<java.lang.Long> defaultValue);
+    method @RequiresApi(18) public static inline int getSize(android.util.SparseLongArray);
+    method @RequiresApi(18) public static inline boolean isEmpty(android.util.SparseLongArray);
+    method @RequiresApi(18) public static inline boolean isNotEmpty(android.util.SparseLongArray);
     method @RequiresApi(18) public static kotlin.collections.IntIterator keyIterator(android.util.SparseLongArray);
     method @RequiresApi(18) public static operator android.util.SparseLongArray plus(android.util.SparseLongArray, android.util.SparseLongArray other);
     method @RequiresApi(18) public static void putAll(android.util.SparseLongArray, android.util.SparseLongArray other);
     method @RequiresApi(18) public static boolean remove(android.util.SparseLongArray, int key, long value);
-    method @RequiresApi(18) public static operator void set(android.util.SparseLongArray, int key, long value);
+    method @RequiresApi(18) public static inline operator void set(android.util.SparseLongArray, int key, long value);
     method @RequiresApi(18) public static kotlin.collections.LongIterator valueIterator(android.util.SparseLongArray);
   }
 
@@ -568,59 +570,60 @@
   public final class MenuKt {
     ctor public MenuKt();
     method public static operator boolean contains(android.view.Menu, android.view.MenuItem item);
-    method public static void forEach(android.view.Menu, kotlin.jvm.functions.Function1<? super android.view.MenuItem,kotlin.Unit> action);
-    method public static void forEachIndexed(android.view.Menu, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super android.view.MenuItem,kotlin.Unit> action);
-    method public static operator android.view.MenuItem get(android.view.Menu, int index);
+    method public static inline void forEach(android.view.Menu, kotlin.jvm.functions.Function1<? super android.view.MenuItem,kotlin.Unit> action);
+    method public static inline void forEachIndexed(android.view.Menu, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super android.view.MenuItem,kotlin.Unit> action);
+    method public static inline operator android.view.MenuItem get(android.view.Menu, int index);
     method public static kotlin.sequences.Sequence<android.view.MenuItem> getChildren(android.view.Menu);
-    method public static int getSize(android.view.Menu);
-    method public static boolean isEmpty(android.view.Menu);
-    method public static boolean isNotEmpty(android.view.Menu);
+    method public static inline int getSize(android.view.Menu);
+    method public static inline boolean isEmpty(android.view.Menu);
+    method public static inline boolean isNotEmpty(android.view.Menu);
     method public static operator java.util.Iterator<android.view.MenuItem> iterator(android.view.Menu);
-    method public static operator void minusAssign(android.view.Menu, android.view.MenuItem item);
+    method public static inline operator void minusAssign(android.view.Menu, android.view.MenuItem item);
   }
 
   public final class ViewGroupKt {
     ctor public ViewGroupKt();
-    method public static operator boolean contains(android.view.ViewGroup, android.view.View view);
-    method public static void forEach(android.view.ViewGroup, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
-    method public static void forEachIndexed(android.view.ViewGroup, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super android.view.View,kotlin.Unit> action);
+    method public static inline operator boolean contains(android.view.ViewGroup, android.view.View view);
+    method public static inline void forEach(android.view.ViewGroup, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
+    method public static inline void forEachIndexed(android.view.ViewGroup, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super android.view.View,kotlin.Unit> action);
     method public static operator android.view.View get(android.view.ViewGroup, int index);
     method public static kotlin.sequences.Sequence<android.view.View> getChildren(android.view.ViewGroup);
-    method public static int getSize(android.view.ViewGroup);
-    method public static boolean isEmpty(android.view.ViewGroup);
-    method public static boolean isNotEmpty(android.view.ViewGroup);
+    method public static inline int getSize(android.view.ViewGroup);
+    method public static inline boolean isEmpty(android.view.ViewGroup);
+    method public static inline boolean isNotEmpty(android.view.ViewGroup);
     method public static operator java.util.Iterator<android.view.View> iterator(android.view.ViewGroup);
-    method public static operator void minusAssign(android.view.ViewGroup, android.view.View view);
-    method public static operator void plusAssign(android.view.ViewGroup, android.view.View view);
-    method public static void setMargins(android.view.ViewGroup.MarginLayoutParams, @Px int size);
-    method public static void updateMargins(android.view.ViewGroup.MarginLayoutParams, @Px int left = android.view.ViewGroup.MarginLayoutParams.leftMargin, @Px int top = android.view.ViewGroup.MarginLayoutParams.topMargin, @Px int right = android.view.ViewGroup.MarginLayoutParams.rightMargin, @Px int bottom = android.view.ViewGroup.MarginLayoutParams.bottomMargin);
-    method @RequiresApi(17) public static void updateMarginsRelative(android.view.ViewGroup.MarginLayoutParams, @Px int start = marginStart, @Px int top = android.view.ViewGroup.MarginLayoutParams.topMargin, @Px int end = marginEnd, @Px int bottom = android.view.ViewGroup.MarginLayoutParams.bottomMargin);
+    method public static inline operator void minusAssign(android.view.ViewGroup, android.view.View view);
+    method public static inline operator void plusAssign(android.view.ViewGroup, android.view.View view);
+    method public static inline void setMargins(android.view.ViewGroup.MarginLayoutParams, @Px int size);
+    method public static inline void updateMargins(android.view.ViewGroup.MarginLayoutParams, @Px int left = android.view.ViewGroup.MarginLayoutParams.leftMargin, @Px int top = android.view.ViewGroup.MarginLayoutParams.topMargin, @Px int right = android.view.ViewGroup.MarginLayoutParams.rightMargin, @Px int bottom = android.view.ViewGroup.MarginLayoutParams.bottomMargin);
+    method @RequiresApi(17) public static inline void updateMarginsRelative(android.view.ViewGroup.MarginLayoutParams, @Px int start = marginStart, @Px int top = android.view.ViewGroup.MarginLayoutParams.topMargin, @Px int end = marginEnd, @Px int bottom = android.view.ViewGroup.MarginLayoutParams.bottomMargin);
   }
 
   public final class ViewKt {
     ctor public ViewKt();
-    method public static void doOnLayout(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
-    method public static void doOnNextLayout(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
-    method public static androidx.core.view.OneShotPreDrawListener doOnPreDraw(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
+    method public static inline void doOnLayout(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
+    method public static inline void doOnNextLayout(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
+    method public static inline androidx.core.view.OneShotPreDrawListener doOnPreDraw(android.view.View, kotlin.jvm.functions.Function1<? super android.view.View,kotlin.Unit> action);
     method public static android.graphics.Bitmap drawToBitmap(android.view.View, android.graphics.Bitmap.Config config = android.graphics.Bitmap.Config.ARGB_8888);
-    method public static int getMarginBottom(android.view.View);
-    method public static int getMarginEnd(android.view.View);
-    method public static int getMarginLeft(android.view.View);
-    method public static int getMarginRight(android.view.View);
-    method public static int getMarginStart(android.view.View);
-    method public static int getMarginTop(android.view.View);
-    method public static boolean isGone(android.view.View);
-    method public static boolean isInvisible(android.view.View);
-    method public static boolean isVisible(android.view.View);
-    method public static Runnable postDelayed(android.view.View, long delayInMillis, kotlin.jvm.functions.Function0<kotlin.Unit> action);
-    method @RequiresApi(16) public static Runnable postOnAnimationDelayed(android.view.View, long delayInMillis, kotlin.jvm.functions.Function0<kotlin.Unit> action);
-    method public static void setGone(android.view.View, boolean value);
-    method public static void setInvisible(android.view.View, boolean value);
-    method public static void setPadding(android.view.View, @Px int size);
-    method public static void setVisible(android.view.View, boolean value);
-    method public static void updateLayoutParams(android.view.View, kotlin.jvm.functions.Function1<? super android.view.ViewGroup.LayoutParams,kotlin.Unit> block);
-    method public static void updatePadding(android.view.View, @Px int left = paddingLeft, @Px int top = paddingTop, @Px int right = paddingRight, @Px int bottom = paddingBottom);
-    method @RequiresApi(17) public static void updatePaddingRelative(android.view.View, @Px int start = paddingStart, @Px int top = paddingTop, @Px int end = paddingEnd, @Px int bottom = paddingBottom);
+    method public static inline int getMarginBottom(android.view.View);
+    method public static inline int getMarginEnd(android.view.View);
+    method public static inline int getMarginLeft(android.view.View);
+    method public static inline int getMarginRight(android.view.View);
+    method public static inline int getMarginStart(android.view.View);
+    method public static inline int getMarginTop(android.view.View);
+    method public static inline boolean isGone(android.view.View);
+    method public static inline boolean isInvisible(android.view.View);
+    method public static inline boolean isVisible(android.view.View);
+    method public static inline Runnable postDelayed(android.view.View, long delayInMillis, kotlin.jvm.functions.Function0<kotlin.Unit> action);
+    method @RequiresApi(16) public static inline Runnable postOnAnimationDelayed(android.view.View, long delayInMillis, kotlin.jvm.functions.Function0<kotlin.Unit> action);
+    method public static inline void setGone(android.view.View, boolean value);
+    method public static inline void setInvisible(android.view.View, boolean value);
+    method public static inline void setPadding(android.view.View, @Px int size);
+    method public static inline void setVisible(android.view.View, boolean value);
+    method public static inline void updateLayoutParams(android.view.View, kotlin.jvm.functions.Function1<? super android.view.ViewGroup.LayoutParams,kotlin.Unit> block);
+    method public static inline <reified T extends android.view.ViewGroup.LayoutParams> void updateLayoutParamsTyped(android.view.View, kotlin.jvm.functions.Function1<? super T,kotlin.Unit>! block);
+    method public static inline void updatePadding(android.view.View, @Px int left = paddingLeft, @Px int top = paddingTop, @Px int right = paddingRight, @Px int bottom = paddingBottom);
+    method @RequiresApi(17) public static inline void updatePaddingRelative(android.view.View, @Px int start = paddingStart, @Px int top = paddingTop, @Px int end = paddingEnd, @Px int bottom = paddingBottom);
   }
 
 }
@@ -629,10 +632,10 @@
 
   public final class TextViewKt {
     ctor public TextViewKt();
-    method public static android.text.TextWatcher addTextChangedListener(android.widget.TextView, kotlin.jvm.functions.Function4<? super java.lang.CharSequence,? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> beforeTextChanged = { _, _, _, _ ->  }, kotlin.jvm.functions.Function4<? super java.lang.CharSequence,? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> onTextChanged = { _, _, _, _ ->  }, kotlin.jvm.functions.Function1<? super android.text.Editable,kotlin.Unit> afterTextChanged = {});
-    method public static android.text.TextWatcher doAfterTextChanged(android.widget.TextView, kotlin.jvm.functions.Function1<? super android.text.Editable,kotlin.Unit> action);
-    method public static android.text.TextWatcher doBeforeTextChanged(android.widget.TextView, kotlin.jvm.functions.Function4<? super java.lang.CharSequence,? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> action);
-    method public static android.text.TextWatcher doOnTextChanged(android.widget.TextView, kotlin.jvm.functions.Function4<? super java.lang.CharSequence,? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> action);
+    method public static inline android.text.TextWatcher addTextChangedListener(android.widget.TextView, kotlin.jvm.functions.Function4<? super java.lang.CharSequence,? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> beforeTextChanged = { _, _, _, _ ->  }, kotlin.jvm.functions.Function4<? super java.lang.CharSequence,? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> onTextChanged = { _, _, _, _ ->  }, kotlin.jvm.functions.Function1<? super android.text.Editable,kotlin.Unit> afterTextChanged = {});
+    method public static inline android.text.TextWatcher doAfterTextChanged(android.widget.TextView, kotlin.jvm.functions.Function1<? super android.text.Editable,kotlin.Unit> action);
+    method public static inline android.text.TextWatcher doBeforeTextChanged(android.widget.TextView, kotlin.jvm.functions.Function4<? super java.lang.CharSequence,? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> action);
+    method public static inline android.text.TextWatcher doOnTextChanged(android.widget.TextView, kotlin.jvm.functions.Function4<? super java.lang.CharSequence,? super java.lang.Integer,? super java.lang.Integer,? super java.lang.Integer,kotlin.Unit> action);
   }
 
 }
diff --git a/cursoradapter/api/1.0.0.txt b/cursoradapter/api/1.0.0.txt
index 691a875..f70e257 100644
--- a/cursoradapter/api/1.0.0.txt
+++ b/cursoradapter/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.cursoradapter.widget {
 
   public abstract class CursorAdapter extends android.widget.BaseAdapter implements android.widget.Filterable {
diff --git a/cursoradapter/api/current.txt b/cursoradapter/api/current.txt
index 691a875..f70e257 100644
--- a/cursoradapter/api/current.txt
+++ b/cursoradapter/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.cursoradapter.widget {
 
   public abstract class CursorAdapter extends android.widget.BaseAdapter implements android.widget.Filterable {
diff --git a/customview/api/1.0.0.txt b/customview/api/1.0.0.txt
index 03155c6..d5249c0 100644
--- a/customview/api/1.0.0.txt
+++ b/customview/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.customview.view {
 
   public abstract class AbsSavedState implements android.os.Parcelable {
diff --git a/customview/api/current.txt b/customview/api/current.txt
index 03155c6..d5249c0 100644
--- a/customview/api/current.txt
+++ b/customview/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.customview.view {
 
   public abstract class AbsSavedState implements android.os.Parcelable {
diff --git a/documentfile/api/1.0.0.txt b/documentfile/api/1.0.0.txt
index eb18f37..0571177 100644
--- a/documentfile/api/1.0.0.txt
+++ b/documentfile/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.documentfile.provider {
 
   public abstract class DocumentFile {
diff --git a/documentfile/api/current.txt b/documentfile/api/current.txt
index eb18f37..0571177 100644
--- a/documentfile/api/current.txt
+++ b/documentfile/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.documentfile.provider {
 
   public abstract class DocumentFile {
diff --git a/drawerlayout/api/1.0.0.txt b/drawerlayout/api/1.0.0.txt
index 4bb8cc2..da9d098 100644
--- a/drawerlayout/api/1.0.0.txt
+++ b/drawerlayout/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.drawerlayout.widget {
 
   public class DrawerLayout extends android.view.ViewGroup {
diff --git a/drawerlayout/api/current.txt b/drawerlayout/api/current.txt
index 4bb8cc2..da9d098 100644
--- a/drawerlayout/api/current.txt
+++ b/drawerlayout/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.drawerlayout.widget {
 
   public class DrawerLayout extends android.view.ViewGroup {
diff --git a/dynamic-animation/api/1.0.0.txt b/dynamic-animation/api/1.0.0.txt
index 5903cec..9a947b0 100644
--- a/dynamic-animation/api/1.0.0.txt
+++ b/dynamic-animation/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.dynamicanimation.animation {
 
   public abstract class DynamicAnimation<T extends androidx.dynamicanimation.animation.DynamicAnimation<T>> {
diff --git a/dynamic-animation/api/current.txt b/dynamic-animation/api/current.txt
index 5903cec..9a947b0 100644
--- a/dynamic-animation/api/current.txt
+++ b/dynamic-animation/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.dynamicanimation.animation {
 
   public abstract class DynamicAnimation<T extends androidx.dynamicanimation.animation.DynamicAnimation<T>> {
diff --git a/dynamic-animation/ktx/api/1.0.0-alpha01.txt b/dynamic-animation/ktx/api/1.0.0-alpha01.txt
index fe2c248..cda5dad 100644
--- a/dynamic-animation/ktx/api/1.0.0-alpha01.txt
+++ b/dynamic-animation/ktx/api/1.0.0-alpha01.txt
@@ -1,11 +1,11 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.dynamicanimation.animation {
 
   public final class DynamicAnimationKt {
     ctor public DynamicAnimationKt();
-    method public static <K> androidx.dynamicanimation.animation.FlingAnimation flingAnimationOf(K!, androidx.dynamicanimation.animation.FloatPropertyCompat<K> property);
-    method public static <K> androidx.dynamicanimation.animation.SpringAnimation springAnimationOf(K!, androidx.dynamicanimation.animation.FloatPropertyCompat<K> property, float finalPosition = Float.NaN);
-    method public static androidx.dynamicanimation.animation.SpringAnimation withSpringForceProperties(androidx.dynamicanimation.animation.SpringAnimation, kotlin.jvm.functions.Function1<? super androidx.dynamicanimation.animation.SpringForce,kotlin.Unit> func);
+    method public static inline <K> androidx.dynamicanimation.animation.FlingAnimation flingAnimationOf(K!, androidx.dynamicanimation.animation.FloatPropertyCompat<K> property);
+    method public static inline <K> androidx.dynamicanimation.animation.SpringAnimation springAnimationOf(K!, androidx.dynamicanimation.animation.FloatPropertyCompat<K> property, float finalPosition = Float.NaN);
+    method public static inline androidx.dynamicanimation.animation.SpringAnimation withSpringForceProperties(androidx.dynamicanimation.animation.SpringAnimation, kotlin.jvm.functions.Function1<? super androidx.dynamicanimation.animation.SpringForce,kotlin.Unit> func);
   }
 
 }
diff --git a/dynamic-animation/ktx/api/current.txt b/dynamic-animation/ktx/api/current.txt
index fe2c248..cda5dad 100644
--- a/dynamic-animation/ktx/api/current.txt
+++ b/dynamic-animation/ktx/api/current.txt
@@ -1,11 +1,11 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.dynamicanimation.animation {
 
   public final class DynamicAnimationKt {
     ctor public DynamicAnimationKt();
-    method public static <K> androidx.dynamicanimation.animation.FlingAnimation flingAnimationOf(K!, androidx.dynamicanimation.animation.FloatPropertyCompat<K> property);
-    method public static <K> androidx.dynamicanimation.animation.SpringAnimation springAnimationOf(K!, androidx.dynamicanimation.animation.FloatPropertyCompat<K> property, float finalPosition = Float.NaN);
-    method public static androidx.dynamicanimation.animation.SpringAnimation withSpringForceProperties(androidx.dynamicanimation.animation.SpringAnimation, kotlin.jvm.functions.Function1<? super androidx.dynamicanimation.animation.SpringForce,kotlin.Unit> func);
+    method public static inline <K> androidx.dynamicanimation.animation.FlingAnimation flingAnimationOf(K!, androidx.dynamicanimation.animation.FloatPropertyCompat<K> property);
+    method public static inline <K> androidx.dynamicanimation.animation.SpringAnimation springAnimationOf(K!, androidx.dynamicanimation.animation.FloatPropertyCompat<K> property, float finalPosition = Float.NaN);
+    method public static inline androidx.dynamicanimation.animation.SpringAnimation withSpringForceProperties(androidx.dynamicanimation.animation.SpringAnimation, kotlin.jvm.functions.Function1<? super androidx.dynamicanimation.animation.SpringForce,kotlin.Unit> func);
   }
 
 }
diff --git a/emoji/appcompat/api/1.0.0.txt b/emoji/appcompat/api/1.0.0.txt
index f5a3c05..a164fb7 100644
--- a/emoji/appcompat/api/1.0.0.txt
+++ b/emoji/appcompat/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.emoji.widget {
 
   public class EmojiAppCompatButton extends androidx.appcompat.widget.AppCompatButton {
diff --git a/emoji/appcompat/api/current.txt b/emoji/appcompat/api/current.txt
index f5a3c05..a164fb7 100644
--- a/emoji/appcompat/api/current.txt
+++ b/emoji/appcompat/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.emoji.widget {
 
   public class EmojiAppCompatButton extends androidx.appcompat.widget.AppCompatButton {
diff --git a/emoji/bundled/api/1.0.0.txt b/emoji/bundled/api/1.0.0.txt
index d1f77a5..7fe3afc 100644
--- a/emoji/bundled/api/1.0.0.txt
+++ b/emoji/bundled/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.emoji.bundled {
 
   public class BundledEmojiCompatConfig extends androidx.emoji.text.EmojiCompat.Config {
diff --git a/emoji/bundled/api/current.txt b/emoji/bundled/api/current.txt
index d1f77a5..7fe3afc 100644
--- a/emoji/bundled/api/current.txt
+++ b/emoji/bundled/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.emoji.bundled {
 
   public class BundledEmojiCompatConfig extends androidx.emoji.text.EmojiCompat.Config {
diff --git a/emoji/core/api/1.0.0.txt b/emoji/core/api/1.0.0.txt
index 83b830a..4f5d70e 100644
--- a/emoji/core/api/1.0.0.txt
+++ b/emoji/core/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.emoji.text {
 
   @AnyThread public class EmojiCompat {
diff --git a/emoji/core/api/current.txt b/emoji/core/api/current.txt
index 83b830a..4f5d70e 100644
--- a/emoji/core/api/current.txt
+++ b/emoji/core/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.emoji.text {
 
   @AnyThread public class EmojiCompat {
diff --git a/enterprise/feedback/api/1.0.0-alpha01.txt b/enterprise/feedback/api/1.0.0-alpha01.txt
index f1dbc74..5a876d5 100644
--- a/enterprise/feedback/api/1.0.0-alpha01.txt
+++ b/enterprise/feedback/api/1.0.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.enterprise.feedback {
 
   public abstract class KeyedAppState {
diff --git a/enterprise/feedback/api/current.txt b/enterprise/feedback/api/current.txt
index f1dbc74..5a876d5 100644
--- a/enterprise/feedback/api/current.txt
+++ b/enterprise/feedback/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.enterprise.feedback {
 
   public abstract class KeyedAppState {
diff --git a/exifinterface/api/1.0.0.txt b/exifinterface/api/1.0.0.txt
index 7635b59..a509b24 100644
--- a/exifinterface/api/1.0.0.txt
+++ b/exifinterface/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.exifinterface.media {
 
   public class ExifInterface {
diff --git a/exifinterface/api/current.txt b/exifinterface/api/current.txt
index 7635b59..a509b24 100644
--- a/exifinterface/api/current.txt
+++ b/exifinterface/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.exifinterface.media {
 
   public class ExifInterface {
diff --git a/fragment/api/1.1.0-alpha04.txt b/fragment/api/1.1.0-alpha04.txt
index 340f3a3..18440d4 100644
--- a/fragment/api/1.1.0-alpha04.txt
+++ b/fragment/api/1.1.0-alpha04.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.fragment.app {
 
   public class DialogFragment extends androidx.fragment.app.Fragment implements android.content.DialogInterface.OnCancelListener android.content.DialogInterface.OnDismissListener {
diff --git a/fragment/api/current.txt b/fragment/api/current.txt
index 340f3a3..18440d4 100644
--- a/fragment/api/current.txt
+++ b/fragment/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.fragment.app {
 
   public class DialogFragment extends androidx.fragment.app.Fragment implements android.content.DialogInterface.OnCancelListener android.content.DialogInterface.OnDismissListener {
diff --git a/fragment/ktx/api/1.1.0-alpha04.txt b/fragment/ktx/api/1.1.0-alpha04.txt
index a4193b9..54ffec7 100644
--- a/fragment/ktx/api/1.1.0-alpha04.txt
+++ b/fragment/ktx/api/1.1.0-alpha04.txt
@@ -1,16 +1,18 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.fragment.app {
 
   public final class FragmentManagerKt {
     ctor public FragmentManagerKt();
-    method public static void commit(androidx.fragment.app.FragmentManager, boolean allowStateLoss = false, kotlin.jvm.functions.Function1<? super androidx.fragment.app.FragmentTransaction,kotlin.Unit> body);
-    method public static void commitNow(androidx.fragment.app.FragmentManager, boolean allowStateLoss = false, kotlin.jvm.functions.Function1<? super androidx.fragment.app.FragmentTransaction,kotlin.Unit> body);
-    method @Deprecated public static void transaction(androidx.fragment.app.FragmentManager, boolean now = false, boolean allowStateLoss = false, kotlin.jvm.functions.Function1<? super androidx.fragment.app.FragmentTransaction,kotlin.Unit> body);
+    method public static inline void commit(androidx.fragment.app.FragmentManager, boolean allowStateLoss = false, kotlin.jvm.functions.Function1<? super androidx.fragment.app.FragmentTransaction,kotlin.Unit> body);
+    method public static inline void commitNow(androidx.fragment.app.FragmentManager, boolean allowStateLoss = false, kotlin.jvm.functions.Function1<? super androidx.fragment.app.FragmentTransaction,kotlin.Unit> body);
+    method @Deprecated public static inline void transaction(androidx.fragment.app.FragmentManager, boolean now = false, boolean allowStateLoss = false, kotlin.jvm.functions.Function1<? super androidx.fragment.app.FragmentTransaction,kotlin.Unit> body);
   }
 
   public final class FragmentViewModelLazyKt {
     ctor public FragmentViewModelLazyKt();
+    method @MainThread public static inline <reified VM extends androidx.lifecycle.ViewModel> kotlin.Lazy<VM>! activityViewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>! factoryProducer = null);
     method @MainThread public static <VM extends androidx.lifecycle.ViewModel> kotlin.Lazy<VM> createViewModelLazy(androidx.fragment.app.Fragment, kotlin.reflect.KClass<VM> viewModelClass, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelStoreOwner> ownerProducer, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>? factoryProducer = null);
+    method @MainThread public static inline <reified VM extends androidx.lifecycle.ViewModel> kotlin.Lazy<VM>! viewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelStoreOwner>! ownerProducer = { this }, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>! factoryProducer = null);
   }
 
 }
diff --git a/fragment/ktx/api/current.txt b/fragment/ktx/api/current.txt
index a4193b9..54ffec7 100644
--- a/fragment/ktx/api/current.txt
+++ b/fragment/ktx/api/current.txt
@@ -1,16 +1,18 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.fragment.app {
 
   public final class FragmentManagerKt {
     ctor public FragmentManagerKt();
-    method public static void commit(androidx.fragment.app.FragmentManager, boolean allowStateLoss = false, kotlin.jvm.functions.Function1<? super androidx.fragment.app.FragmentTransaction,kotlin.Unit> body);
-    method public static void commitNow(androidx.fragment.app.FragmentManager, boolean allowStateLoss = false, kotlin.jvm.functions.Function1<? super androidx.fragment.app.FragmentTransaction,kotlin.Unit> body);
-    method @Deprecated public static void transaction(androidx.fragment.app.FragmentManager, boolean now = false, boolean allowStateLoss = false, kotlin.jvm.functions.Function1<? super androidx.fragment.app.FragmentTransaction,kotlin.Unit> body);
+    method public static inline void commit(androidx.fragment.app.FragmentManager, boolean allowStateLoss = false, kotlin.jvm.functions.Function1<? super androidx.fragment.app.FragmentTransaction,kotlin.Unit> body);
+    method public static inline void commitNow(androidx.fragment.app.FragmentManager, boolean allowStateLoss = false, kotlin.jvm.functions.Function1<? super androidx.fragment.app.FragmentTransaction,kotlin.Unit> body);
+    method @Deprecated public static inline void transaction(androidx.fragment.app.FragmentManager, boolean now = false, boolean allowStateLoss = false, kotlin.jvm.functions.Function1<? super androidx.fragment.app.FragmentTransaction,kotlin.Unit> body);
   }
 
   public final class FragmentViewModelLazyKt {
     ctor public FragmentViewModelLazyKt();
+    method @MainThread public static inline <reified VM extends androidx.lifecycle.ViewModel> kotlin.Lazy<VM>! activityViewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>! factoryProducer = null);
     method @MainThread public static <VM extends androidx.lifecycle.ViewModel> kotlin.Lazy<VM> createViewModelLazy(androidx.fragment.app.Fragment, kotlin.reflect.KClass<VM> viewModelClass, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelStoreOwner> ownerProducer, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>? factoryProducer = null);
+    method @MainThread public static inline <reified VM extends androidx.lifecycle.ViewModel> kotlin.Lazy<VM>! viewModels(androidx.fragment.app.Fragment, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelStoreOwner>! ownerProducer = { this }, kotlin.jvm.functions.Function0<? extends androidx.lifecycle.ViewModelProvider.Factory>! factoryProducer = null);
   }
 
 }
diff --git a/fragment/testing/api/1.1.0-alpha04.txt b/fragment/testing/api/1.1.0-alpha04.txt
index 8c83aa3..6374c9f 100644
--- a/fragment/testing/api/1.1.0-alpha04.txt
+++ b/fragment/testing/api/1.1.0-alpha04.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.fragment.app.testing {
 
   public final class FragmentScenario<F extends androidx.fragment.app.Fragment> {
@@ -21,6 +21,10 @@
 
   public final class FragmentScenarioKt {
     ctor public FragmentScenarioKt();
+    method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.testing.FragmentScenario<F>! launchFragment(android.os.Bundle! fragmentArgs = null, int themeResId = R.style.FragmentScenarioEmptyFragmentActivityTheme, androidx.fragment.app.FragmentFactory! factory = null);
+    method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.testing.FragmentScenario<F>! launchFragment(android.os.Bundle! fragmentArgs = null, int themeResId = R.style.FragmentScenarioEmptyFragmentActivityTheme, kotlin.jvm.functions.Function1<? super android.os.Bundle,? extends F>! instantiate);
+    method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.testing.FragmentScenario<F>! launchFragmentInContainer(android.os.Bundle! fragmentArgs = null, int themeResId = R.style.FragmentScenarioEmptyFragmentActivityTheme, androidx.fragment.app.FragmentFactory! factory = null);
+    method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.testing.FragmentScenario<F>! launchFragmentInContainer(android.os.Bundle! fragmentArgs = null, int themeResId = R.style.FragmentScenarioEmptyFragmentActivityTheme, kotlin.jvm.functions.Function1<? super android.os.Bundle,? extends F>! instantiate);
   }
 
 }
diff --git a/fragment/testing/api/current.txt b/fragment/testing/api/current.txt
index 8c83aa3..6374c9f 100644
--- a/fragment/testing/api/current.txt
+++ b/fragment/testing/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.fragment.app.testing {
 
   public final class FragmentScenario<F extends androidx.fragment.app.Fragment> {
@@ -21,6 +21,10 @@
 
   public final class FragmentScenarioKt {
     ctor public FragmentScenarioKt();
+    method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.testing.FragmentScenario<F>! launchFragment(android.os.Bundle! fragmentArgs = null, int themeResId = R.style.FragmentScenarioEmptyFragmentActivityTheme, androidx.fragment.app.FragmentFactory! factory = null);
+    method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.testing.FragmentScenario<F>! launchFragment(android.os.Bundle! fragmentArgs = null, int themeResId = R.style.FragmentScenarioEmptyFragmentActivityTheme, kotlin.jvm.functions.Function1<? super android.os.Bundle,? extends F>! instantiate);
+    method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.testing.FragmentScenario<F>! launchFragmentInContainer(android.os.Bundle! fragmentArgs = null, int themeResId = R.style.FragmentScenarioEmptyFragmentActivityTheme, androidx.fragment.app.FragmentFactory! factory = null);
+    method public static inline <reified F extends androidx.fragment.app.Fragment> androidx.fragment.app.testing.FragmentScenario<F>! launchFragmentInContainer(android.os.Bundle! fragmentArgs = null, int themeResId = R.style.FragmentScenarioEmptyFragmentActivityTheme, kotlin.jvm.functions.Function1<? super android.os.Bundle,? extends F>! instantiate);
   }
 
 }
diff --git a/graphics/drawable/animated/api/1.1.0-alpha01.txt b/graphics/drawable/animated/api/1.1.0-alpha01.txt
index a81c3a2..7542e29 100644
--- a/graphics/drawable/animated/api/1.1.0-alpha01.txt
+++ b/graphics/drawable/animated/api/1.1.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.vectordrawable.graphics.drawable {
 
   public interface Animatable2Compat extends android.graphics.drawable.Animatable {
diff --git a/graphics/drawable/animated/api/current.txt b/graphics/drawable/animated/api/current.txt
index a81c3a2..7542e29 100644
--- a/graphics/drawable/animated/api/current.txt
+++ b/graphics/drawable/animated/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.vectordrawable.graphics.drawable {
 
   public interface Animatable2Compat extends android.graphics.drawable.Animatable {
diff --git a/graphics/drawable/static/api/1.1.0-alpha01.txt b/graphics/drawable/static/api/1.1.0-alpha01.txt
index 53c58ae7..3fda85b 100644
--- a/graphics/drawable/static/api/1.1.0-alpha01.txt
+++ b/graphics/drawable/static/api/1.1.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.vectordrawable.graphics.drawable {
 
   public class VectorDrawableCompat extends android.graphics.drawable.Drawable implements androidx.core.graphics.drawable.TintAwareDrawable {
diff --git a/graphics/drawable/static/api/current.txt b/graphics/drawable/static/api/current.txt
index 53c58ae7..3fda85b 100644
--- a/graphics/drawable/static/api/current.txt
+++ b/graphics/drawable/static/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.vectordrawable.graphics.drawable {
 
   public class VectorDrawableCompat extends android.graphics.drawable.Drawable implements androidx.core.graphics.drawable.TintAwareDrawable {
diff --git a/gridlayout/api/1.1.0-alpha01.txt b/gridlayout/api/1.1.0-alpha01.txt
index 9c7a8da..1c7a068 100644
--- a/gridlayout/api/1.1.0-alpha01.txt
+++ b/gridlayout/api/1.1.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.gridlayout.widget {
 
   public class GridLayout extends android.view.ViewGroup {
diff --git a/gridlayout/api/current.txt b/gridlayout/api/current.txt
index 9c7a8da..1c7a068 100644
--- a/gridlayout/api/current.txt
+++ b/gridlayout/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.gridlayout.widget {
 
   public class GridLayout extends android.view.ViewGroup {
diff --git a/heifwriter/api/1.0.0.txt b/heifwriter/api/1.0.0.txt
index 5403f3e..607f763 100644
--- a/heifwriter/api/1.0.0.txt
+++ b/heifwriter/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.heifwriter {
 
   public final class HeifWriter implements java.lang.AutoCloseable {
diff --git a/heifwriter/api/current.txt b/heifwriter/api/current.txt
index 5403f3e..607f763 100644
--- a/heifwriter/api/current.txt
+++ b/heifwriter/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.heifwriter {
 
   public final class HeifWriter implements java.lang.AutoCloseable {
diff --git a/interpolator/api/1.0.0.txt b/interpolator/api/1.0.0.txt
index 83c2124f..5ce1a38 100644
--- a/interpolator/api/1.0.0.txt
+++ b/interpolator/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.interpolator.view.animation {
 
   public class FastOutLinearInInterpolator implements android.view.animation.Interpolator {
diff --git a/interpolator/api/current.txt b/interpolator/api/current.txt
index 83c2124f..5ce1a38 100644
--- a/interpolator/api/current.txt
+++ b/interpolator/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.interpolator.view.animation {
 
   public class FastOutLinearInInterpolator implements android.view.animation.Interpolator {
diff --git a/leanback-preference/api/1.1.0-alpha01.txt b/leanback-preference/api/1.1.0-alpha01.txt
index 75f7d49..79e53fb 100644
--- a/leanback-preference/api/1.1.0-alpha01.txt
+++ b/leanback-preference/api/1.1.0-alpha01.txt
@@ -1,9 +1,8 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.leanback.preference {
 
   @Deprecated public abstract class BaseLeanbackPreferenceFragment extends androidx.preference.PreferenceFragment {
     ctor @Deprecated public BaseLeanbackPreferenceFragment();
-    method @Deprecated public androidx.recyclerview.widget.RecyclerView! onCreateRecyclerView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
   }
 
   public abstract class BaseLeanbackPreferenceFragmentCompat extends androidx.preference.PreferenceFragmentCompat {
@@ -22,8 +21,6 @@
     method @Deprecated public static androidx.leanback.preference.LeanbackListPreferenceDialogFragment! newInstanceMulti(String!);
     method @Deprecated public static androidx.leanback.preference.LeanbackListPreferenceDialogFragment! newInstanceSingle(String!);
     method @Deprecated public androidx.recyclerview.widget.RecyclerView.Adapter! onCreateAdapter();
-    method @Deprecated public android.view.View? onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle!);
   }
 
   @Deprecated public class LeanbackListPreferenceDialogFragment.AdapterMulti extends androidx.recyclerview.widget.RecyclerView.Adapter<androidx.leanback.preference.LeanbackListPreferenceDialogFragment.ViewHolder> implements androidx.leanback.preference.LeanbackListPreferenceDialogFragment.ViewHolder.OnItemClickListener {
@@ -70,7 +67,6 @@
   @Deprecated public class LeanbackPreferenceDialogFragment extends android.app.Fragment {
     ctor @Deprecated public LeanbackPreferenceDialogFragment();
     method @Deprecated public androidx.preference.DialogPreference! getPreference();
-    method @Deprecated public void onCreate(android.os.Bundle!);
     field @Deprecated public static final String ARG_KEY = "key";
   }
 
@@ -82,8 +78,6 @@
 
   @Deprecated public abstract class LeanbackPreferenceFragment extends androidx.leanback.preference.BaseLeanbackPreferenceFragment {
     ctor @Deprecated public LeanbackPreferenceFragment();
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onViewCreated(android.view.View!, android.os.Bundle!);
     method @Deprecated public void setTitle(CharSequence!);
   }
 
@@ -94,12 +88,8 @@
 
   @Deprecated public abstract class LeanbackSettingsFragment extends android.app.Fragment implements androidx.preference.PreferenceFragment.OnPreferenceDisplayDialogCallback androidx.preference.PreferenceFragment.OnPreferenceStartFragmentCallback androidx.preference.PreferenceFragment.OnPreferenceStartScreenCallback {
     ctor @Deprecated public LeanbackSettingsFragment();
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onPause();
     method @Deprecated public boolean onPreferenceDisplayDialog(androidx.preference.PreferenceFragment, androidx.preference.Preference!);
     method @Deprecated public abstract void onPreferenceStartInitialScreen();
-    method @Deprecated public void onResume();
-    method @Deprecated public void onViewCreated(android.view.View!, android.os.Bundle!);
     method @Deprecated public void startImmersiveFragment(android.app.Fragment);
     method @Deprecated public void startPreferenceFragment(android.app.Fragment);
   }
diff --git a/leanback-preference/api/current.txt b/leanback-preference/api/current.txt
index 75f7d49..79e53fb 100644
--- a/leanback-preference/api/current.txt
+++ b/leanback-preference/api/current.txt
@@ -1,9 +1,8 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.leanback.preference {
 
   @Deprecated public abstract class BaseLeanbackPreferenceFragment extends androidx.preference.PreferenceFragment {
     ctor @Deprecated public BaseLeanbackPreferenceFragment();
-    method @Deprecated public androidx.recyclerview.widget.RecyclerView! onCreateRecyclerView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
   }
 
   public abstract class BaseLeanbackPreferenceFragmentCompat extends androidx.preference.PreferenceFragmentCompat {
@@ -22,8 +21,6 @@
     method @Deprecated public static androidx.leanback.preference.LeanbackListPreferenceDialogFragment! newInstanceMulti(String!);
     method @Deprecated public static androidx.leanback.preference.LeanbackListPreferenceDialogFragment! newInstanceSingle(String!);
     method @Deprecated public androidx.recyclerview.widget.RecyclerView.Adapter! onCreateAdapter();
-    method @Deprecated public android.view.View? onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle!);
   }
 
   @Deprecated public class LeanbackListPreferenceDialogFragment.AdapterMulti extends androidx.recyclerview.widget.RecyclerView.Adapter<androidx.leanback.preference.LeanbackListPreferenceDialogFragment.ViewHolder> implements androidx.leanback.preference.LeanbackListPreferenceDialogFragment.ViewHolder.OnItemClickListener {
@@ -70,7 +67,6 @@
   @Deprecated public class LeanbackPreferenceDialogFragment extends android.app.Fragment {
     ctor @Deprecated public LeanbackPreferenceDialogFragment();
     method @Deprecated public androidx.preference.DialogPreference! getPreference();
-    method @Deprecated public void onCreate(android.os.Bundle!);
     field @Deprecated public static final String ARG_KEY = "key";
   }
 
@@ -82,8 +78,6 @@
 
   @Deprecated public abstract class LeanbackPreferenceFragment extends androidx.leanback.preference.BaseLeanbackPreferenceFragment {
     ctor @Deprecated public LeanbackPreferenceFragment();
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onViewCreated(android.view.View!, android.os.Bundle!);
     method @Deprecated public void setTitle(CharSequence!);
   }
 
@@ -94,12 +88,8 @@
 
   @Deprecated public abstract class LeanbackSettingsFragment extends android.app.Fragment implements androidx.preference.PreferenceFragment.OnPreferenceDisplayDialogCallback androidx.preference.PreferenceFragment.OnPreferenceStartFragmentCallback androidx.preference.PreferenceFragment.OnPreferenceStartScreenCallback {
     ctor @Deprecated public LeanbackSettingsFragment();
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onPause();
     method @Deprecated public boolean onPreferenceDisplayDialog(androidx.preference.PreferenceFragment, androidx.preference.Preference!);
     method @Deprecated public abstract void onPreferenceStartInitialScreen();
-    method @Deprecated public void onResume();
-    method @Deprecated public void onViewCreated(android.view.View!, android.os.Bundle!);
     method @Deprecated public void startImmersiveFragment(android.app.Fragment);
     method @Deprecated public void startPreferenceFragment(android.app.Fragment);
   }
diff --git a/leanback/api/1.1.0-alpha01.txt b/leanback/api/1.1.0-alpha01.txt
index f26a898..9dab078 100644
--- a/leanback/api/1.1.0-alpha01.txt
+++ b/leanback/api/1.1.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.leanback.app {
 
   public final class BackgroundManager {
@@ -24,7 +24,6 @@
   @Deprecated public class BaseFragment extends androidx.leanback.app.BrandedFragment {
     method @Deprecated protected Object! createEntranceTransition();
     method @Deprecated public final androidx.leanback.app.ProgressBarManager! getProgressBarManager();
-    method @Deprecated public void onCreate(android.os.Bundle!);
     method @Deprecated protected void onEntranceTransitionEnd();
     method @Deprecated protected void onEntranceTransitionPrepare();
     method @Deprecated protected void onEntranceTransitionStart();
@@ -54,13 +53,7 @@
     method @Deprecated public androidx.leanback.widget.TitleViewAdapter! getTitleViewAdapter();
     method @Deprecated public void installTitleView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
     method @Deprecated public final boolean isShowingTitle();
-    method @Deprecated public void onDestroyView();
     method @Deprecated public android.view.View! onInflateTitleView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onPause();
-    method @Deprecated public void onResume();
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle!);
-    method @Deprecated public void onStart();
-    method @Deprecated public void onViewCreated(android.view.View, android.os.Bundle?);
     method @Deprecated public void setBadgeDrawable(android.graphics.drawable.Drawable!);
     method @Deprecated public void setOnSearchClickedListener(android.view.View.OnClickListener!);
     method @Deprecated public void setSearchAffordanceColor(int);
@@ -111,9 +104,6 @@
     method @Deprecated public boolean isInHeadersTransition();
     method @Deprecated public boolean isShowingHeaders();
     method @Deprecated public androidx.leanback.app.HeadersFragment! onCreateHeadersFragment();
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onDestroy();
-    method @Deprecated public void onStop();
     method @Deprecated public void setAdapter(androidx.leanback.widget.ObjectAdapter!);
     method @Deprecated public void setBrandColor(@ColorInt int);
     method @Deprecated public void setBrowseTransitionListener(androidx.leanback.app.BrowseFragment.BrowseTransitionListener!);
@@ -299,10 +289,8 @@
     method @Deprecated public androidx.leanback.widget.DetailsParallax! getParallax();
     method @Deprecated public androidx.leanback.app.RowsFragment! getRowsFragment();
     method @Deprecated protected android.view.View! inflateTitle(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
     method @Deprecated protected void onSetDetailsOverviewRowStatus(androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter!, androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter.ViewHolder!, int, int, int);
     method @Deprecated protected void onSetRowStatus(androidx.leanback.widget.RowPresenter!, androidx.leanback.widget.RowPresenter.ViewHolder!, int, int, int);
-    method @Deprecated public void onStop();
     method @Deprecated public void setAdapter(androidx.leanback.widget.ObjectAdapter!);
     method @Deprecated public void setOnItemViewClickedListener(androidx.leanback.widget.BaseOnItemViewClickedListener!);
     method @Deprecated public void setOnItemViewSelectedListener(androidx.leanback.widget.BaseOnItemViewSelectedListener!);
@@ -381,7 +369,6 @@
     method @Deprecated public android.graphics.drawable.Drawable! getImageDrawable();
     method @Deprecated public CharSequence! getMessage();
     method @Deprecated public boolean isBackgroundTranslucent();
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
     method @Deprecated public void setBackgroundDrawable(android.graphics.drawable.Drawable!);
     method @Deprecated public void setButtonClickListener(android.view.View.OnClickListener!);
     method @Deprecated public void setButtonText(String!);
@@ -438,7 +425,6 @@
     method @Deprecated public void notifyActionChanged(int);
     method @Deprecated public void notifyButtonActionChanged(int);
     method @Deprecated protected void onAddSharedElementTransition(android.app.FragmentTransaction!, androidx.leanback.app.GuidedStepFragment!);
-    method @Deprecated public void onCreate(android.os.Bundle!);
     method @Deprecated public void onCreateActions(java.util.List<androidx.leanback.widget.GuidedAction>, android.os.Bundle!);
     method @Deprecated public androidx.leanback.widget.GuidedActionsStylist! onCreateActionsStylist();
     method @Deprecated public android.view.View! onCreateBackgroundView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
@@ -446,8 +432,6 @@
     method @Deprecated public androidx.leanback.widget.GuidedActionsStylist! onCreateButtonActionsStylist();
     method @Deprecated public androidx.leanback.widget.GuidanceStylist.Guidance onCreateGuidance(android.os.Bundle!);
     method @Deprecated public androidx.leanback.widget.GuidanceStylist! onCreateGuidanceStylist();
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onDestroyView();
     method @Deprecated public void onGuidedActionClicked(androidx.leanback.widget.GuidedAction!);
     method @Deprecated public void onGuidedActionEditCanceled(androidx.leanback.widget.GuidedAction!);
     method @Deprecated public void onGuidedActionEdited(androidx.leanback.widget.GuidedAction!);
@@ -455,8 +439,6 @@
     method @Deprecated public void onGuidedActionFocused(androidx.leanback.widget.GuidedAction!);
     method @Deprecated protected void onProvideFragmentTransitions();
     method @Deprecated public int onProvideTheme();
-    method @Deprecated public void onResume();
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle!);
     method @Deprecated public boolean onSubGuidedActionClicked(androidx.leanback.widget.GuidedAction!);
     method @Deprecated public void openInEditMode(androidx.leanback.widget.GuidedAction!);
     method @Deprecated public void popBackStackToGuidedStepFragment(Class!, int);
@@ -543,13 +525,9 @@
     method @Deprecated public int getSelectedPosition();
     method @Deprecated public final androidx.leanback.widget.VerticalGridView! getVerticalGridView();
     method @Deprecated public boolean isScrolling();
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onDestroyView();
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle!);
     method @Deprecated public void onTransitionEnd();
     method @Deprecated public boolean onTransitionPrepare();
     method @Deprecated public void onTransitionStart();
-    method @Deprecated public void onViewCreated(android.view.View, android.os.Bundle?);
     method @Deprecated public final void setAdapter(androidx.leanback.widget.ObjectAdapter!);
     method @Deprecated public void setAlignment(int);
     method @Deprecated public void setOnHeaderClickedListener(androidx.leanback.app.HeadersFragment.OnHeaderClickedListener!);
@@ -619,13 +597,10 @@
     method @Deprecated protected abstract android.view.View? onCreateForegroundView(android.view.LayoutInflater!, android.view.ViewGroup!);
     method @Deprecated protected android.animation.Animator? onCreateLogoAnimation();
     method @Deprecated protected android.animation.Animator! onCreateTitleAnimator();
-    method @Deprecated public android.view.View? onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
     method @Deprecated protected void onFinishFragment();
     method @Deprecated protected void onLogoAnimationFinished();
     method @Deprecated protected void onPageChanged(int, int);
     method @Deprecated public int onProvideTheme();
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle!);
-    method @Deprecated public void onViewCreated(android.view.View, android.os.Bundle?);
     method @Deprecated public void setArrowBackgroundColor(@ColorInt int);
     method @Deprecated public void setArrowColor(@ColorInt int);
     method @Deprecated public void setDescriptionViewTextColor(@ColorInt int);
@@ -689,17 +664,8 @@
     method @Deprecated public boolean isShowOrHideControlsOverlayOnUserInteraction();
     method @Deprecated public void notifyPlaybackRowChanged();
     method @Deprecated protected void onBufferingStateChanged(boolean);
-    method @Deprecated public void onCreate(android.os.Bundle!);
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onDestroy();
-    method @Deprecated public void onDestroyView();
     method @Deprecated protected void onError(int, CharSequence!);
-    method @Deprecated public void onPause();
-    method @Deprecated public void onResume();
-    method @Deprecated public void onStart();
-    method @Deprecated public void onStop();
     method @Deprecated protected void onVideoSizeChanged(int, int);
-    method @Deprecated public void onViewCreated(android.view.View, android.os.Bundle?);
     method @Deprecated public void setAdapter(androidx.leanback.widget.ObjectAdapter!);
     method @Deprecated public void setBackgroundType(int);
     method @Deprecated public void setControlsOverlayAutoHideEnabled(boolean);
@@ -725,19 +691,7 @@
   @Deprecated public class PlaybackFragmentGlueHost extends androidx.leanback.media.PlaybackGlueHost implements androidx.leanback.widget.PlaybackSeekUi {
     ctor @Deprecated public PlaybackFragmentGlueHost(androidx.leanback.app.PlaybackFragment!);
     method @Deprecated public void fadeOut();
-    method @Deprecated public androidx.leanback.media.PlaybackGlueHost.PlayerCallback! getPlayerCallback();
-    method @Deprecated public void hideControlsOverlay(boolean);
-    method @Deprecated public boolean isControlsOverlayAutoHideEnabled();
-    method @Deprecated public boolean isControlsOverlayVisible();
-    method @Deprecated public void notifyPlaybackRowChanged();
-    method @Deprecated public void setControlsOverlayAutoHideEnabled(boolean);
-    method @Deprecated public void setHostCallback(androidx.leanback.media.PlaybackGlueHost.HostCallback!);
-    method @Deprecated public void setOnActionClickedListener(androidx.leanback.widget.OnActionClickedListener!);
-    method @Deprecated public void setOnKeyInterceptListener(android.view.View.OnKeyListener!);
-    method @Deprecated public void setPlaybackRow(androidx.leanback.widget.Row!);
-    method @Deprecated public void setPlaybackRowPresenter(androidx.leanback.widget.PlaybackRowPresenter!);
     method @Deprecated public void setPlaybackSeekUiClient(androidx.leanback.widget.PlaybackSeekUi.Client!);
-    method @Deprecated public void showControlsOverlay(boolean);
   }
 
   public class PlaybackSupportFragment extends androidx.fragment.app.Fragment {
@@ -811,14 +765,9 @@
     method @Deprecated public int getSelectedPosition();
     method @Deprecated public final androidx.leanback.widget.VerticalGridView! getVerticalGridView();
     method @Deprecated public boolean isScrolling();
-    method @Deprecated public void onCreate(android.os.Bundle!);
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onDestroyView();
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle!);
     method @Deprecated public void onTransitionEnd();
     method @Deprecated public boolean onTransitionPrepare();
     method @Deprecated public void onTransitionStart();
-    method @Deprecated public void onViewCreated(android.view.View, android.os.Bundle?);
     method @Deprecated public final void setAdapter(androidx.leanback.widget.ObjectAdapter!);
     method @Deprecated public void setAlignment(int);
     method @Deprecated public void setEntranceTransitionState(boolean);
@@ -889,13 +838,6 @@
     method @Deprecated public androidx.leanback.app.RowsFragment! getRowsFragment();
     method @Deprecated public String! getTitle();
     method @Deprecated public static androidx.leanback.app.SearchFragment! newInstance(String!);
-    method @Deprecated public void onCreate(android.os.Bundle!);
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onDestroy();
-    method @Deprecated public void onPause();
-    method @Deprecated public void onRequestPermissionsResult(int, String[]!, int[]!);
-    method @Deprecated public void onResume();
-    method @Deprecated public void onStart();
     method @Deprecated public void setBadgeDrawable(android.graphics.drawable.Drawable!);
     method @Deprecated public void setOnItemViewClickedListener(androidx.leanback.widget.OnItemViewClickedListener!);
     method @Deprecated public void setOnItemViewSelectedListener(androidx.leanback.widget.OnItemViewSelectedListener!);
@@ -949,7 +891,6 @@
     method @Deprecated public androidx.leanback.widget.ObjectAdapter! getAdapter();
     method @Deprecated public androidx.leanback.widget.VerticalGridPresenter! getGridPresenter();
     method @Deprecated public androidx.leanback.widget.OnItemViewClickedListener! getOnItemViewClickedListener();
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
     method @Deprecated public void setAdapter(androidx.leanback.widget.ObjectAdapter!);
     method @Deprecated public void setGridPresenter(androidx.leanback.widget.VerticalGridPresenter!);
     method @Deprecated public void setOnItemViewClickedListener(androidx.leanback.widget.OnItemViewClickedListener!);
@@ -1127,10 +1068,6 @@
     method @Deprecated public long getSupportedActions();
     method @Deprecated public boolean hasValidMedia();
     method @Deprecated public boolean isMediaPlaying();
-    method @Deprecated public void next();
-    method @Deprecated public void pause();
-    method @Deprecated public void play(int);
-    method @Deprecated public void previous();
   }
 
   public class MediaPlayerAdapter extends androidx.leanback.media.PlayerAdapter {
@@ -1755,12 +1692,6 @@
     method @Deprecated public androidx.leanback.widget.OnActionClickedListener! getOnActionClickedListener();
     method @Deprecated public boolean isStyleLarge();
     method @Deprecated public final boolean isUsingDefaultSelectEffect();
-    method @Deprecated protected void onBindRowViewHolder(androidx.leanback.widget.RowPresenter.ViewHolder!, Object!);
-    method @Deprecated protected void onRowViewAttachedToWindow(androidx.leanback.widget.RowPresenter.ViewHolder!);
-    method @Deprecated protected void onRowViewDetachedFromWindow(androidx.leanback.widget.RowPresenter.ViewHolder!);
-    method @Deprecated protected void onRowViewSelected(androidx.leanback.widget.RowPresenter.ViewHolder!, boolean);
-    method @Deprecated protected void onSelectLevelChanged(androidx.leanback.widget.RowPresenter.ViewHolder!);
-    method @Deprecated protected void onUnbindRowViewHolder(androidx.leanback.widget.RowPresenter.ViewHolder!);
     method @Deprecated public void setBackgroundColor(@ColorInt int);
     method @Deprecated public void setOnActionClickedListener(androidx.leanback.widget.OnActionClickedListener!);
     method @Deprecated public final void setSharedElementEnterTransition(android.app.Activity!, String!, long);
diff --git a/leanback/api/current.txt b/leanback/api/current.txt
index f26a898..9dab078 100644
--- a/leanback/api/current.txt
+++ b/leanback/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.leanback.app {
 
   public final class BackgroundManager {
@@ -24,7 +24,6 @@
   @Deprecated public class BaseFragment extends androidx.leanback.app.BrandedFragment {
     method @Deprecated protected Object! createEntranceTransition();
     method @Deprecated public final androidx.leanback.app.ProgressBarManager! getProgressBarManager();
-    method @Deprecated public void onCreate(android.os.Bundle!);
     method @Deprecated protected void onEntranceTransitionEnd();
     method @Deprecated protected void onEntranceTransitionPrepare();
     method @Deprecated protected void onEntranceTransitionStart();
@@ -54,13 +53,7 @@
     method @Deprecated public androidx.leanback.widget.TitleViewAdapter! getTitleViewAdapter();
     method @Deprecated public void installTitleView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
     method @Deprecated public final boolean isShowingTitle();
-    method @Deprecated public void onDestroyView();
     method @Deprecated public android.view.View! onInflateTitleView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onPause();
-    method @Deprecated public void onResume();
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle!);
-    method @Deprecated public void onStart();
-    method @Deprecated public void onViewCreated(android.view.View, android.os.Bundle?);
     method @Deprecated public void setBadgeDrawable(android.graphics.drawable.Drawable!);
     method @Deprecated public void setOnSearchClickedListener(android.view.View.OnClickListener!);
     method @Deprecated public void setSearchAffordanceColor(int);
@@ -111,9 +104,6 @@
     method @Deprecated public boolean isInHeadersTransition();
     method @Deprecated public boolean isShowingHeaders();
     method @Deprecated public androidx.leanback.app.HeadersFragment! onCreateHeadersFragment();
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onDestroy();
-    method @Deprecated public void onStop();
     method @Deprecated public void setAdapter(androidx.leanback.widget.ObjectAdapter!);
     method @Deprecated public void setBrandColor(@ColorInt int);
     method @Deprecated public void setBrowseTransitionListener(androidx.leanback.app.BrowseFragment.BrowseTransitionListener!);
@@ -299,10 +289,8 @@
     method @Deprecated public androidx.leanback.widget.DetailsParallax! getParallax();
     method @Deprecated public androidx.leanback.app.RowsFragment! getRowsFragment();
     method @Deprecated protected android.view.View! inflateTitle(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
     method @Deprecated protected void onSetDetailsOverviewRowStatus(androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter!, androidx.leanback.widget.FullWidthDetailsOverviewRowPresenter.ViewHolder!, int, int, int);
     method @Deprecated protected void onSetRowStatus(androidx.leanback.widget.RowPresenter!, androidx.leanback.widget.RowPresenter.ViewHolder!, int, int, int);
-    method @Deprecated public void onStop();
     method @Deprecated public void setAdapter(androidx.leanback.widget.ObjectAdapter!);
     method @Deprecated public void setOnItemViewClickedListener(androidx.leanback.widget.BaseOnItemViewClickedListener!);
     method @Deprecated public void setOnItemViewSelectedListener(androidx.leanback.widget.BaseOnItemViewSelectedListener!);
@@ -381,7 +369,6 @@
     method @Deprecated public android.graphics.drawable.Drawable! getImageDrawable();
     method @Deprecated public CharSequence! getMessage();
     method @Deprecated public boolean isBackgroundTranslucent();
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
     method @Deprecated public void setBackgroundDrawable(android.graphics.drawable.Drawable!);
     method @Deprecated public void setButtonClickListener(android.view.View.OnClickListener!);
     method @Deprecated public void setButtonText(String!);
@@ -438,7 +425,6 @@
     method @Deprecated public void notifyActionChanged(int);
     method @Deprecated public void notifyButtonActionChanged(int);
     method @Deprecated protected void onAddSharedElementTransition(android.app.FragmentTransaction!, androidx.leanback.app.GuidedStepFragment!);
-    method @Deprecated public void onCreate(android.os.Bundle!);
     method @Deprecated public void onCreateActions(java.util.List<androidx.leanback.widget.GuidedAction>, android.os.Bundle!);
     method @Deprecated public androidx.leanback.widget.GuidedActionsStylist! onCreateActionsStylist();
     method @Deprecated public android.view.View! onCreateBackgroundView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
@@ -446,8 +432,6 @@
     method @Deprecated public androidx.leanback.widget.GuidedActionsStylist! onCreateButtonActionsStylist();
     method @Deprecated public androidx.leanback.widget.GuidanceStylist.Guidance onCreateGuidance(android.os.Bundle!);
     method @Deprecated public androidx.leanback.widget.GuidanceStylist! onCreateGuidanceStylist();
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onDestroyView();
     method @Deprecated public void onGuidedActionClicked(androidx.leanback.widget.GuidedAction!);
     method @Deprecated public void onGuidedActionEditCanceled(androidx.leanback.widget.GuidedAction!);
     method @Deprecated public void onGuidedActionEdited(androidx.leanback.widget.GuidedAction!);
@@ -455,8 +439,6 @@
     method @Deprecated public void onGuidedActionFocused(androidx.leanback.widget.GuidedAction!);
     method @Deprecated protected void onProvideFragmentTransitions();
     method @Deprecated public int onProvideTheme();
-    method @Deprecated public void onResume();
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle!);
     method @Deprecated public boolean onSubGuidedActionClicked(androidx.leanback.widget.GuidedAction!);
     method @Deprecated public void openInEditMode(androidx.leanback.widget.GuidedAction!);
     method @Deprecated public void popBackStackToGuidedStepFragment(Class!, int);
@@ -543,13 +525,9 @@
     method @Deprecated public int getSelectedPosition();
     method @Deprecated public final androidx.leanback.widget.VerticalGridView! getVerticalGridView();
     method @Deprecated public boolean isScrolling();
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onDestroyView();
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle!);
     method @Deprecated public void onTransitionEnd();
     method @Deprecated public boolean onTransitionPrepare();
     method @Deprecated public void onTransitionStart();
-    method @Deprecated public void onViewCreated(android.view.View, android.os.Bundle?);
     method @Deprecated public final void setAdapter(androidx.leanback.widget.ObjectAdapter!);
     method @Deprecated public void setAlignment(int);
     method @Deprecated public void setOnHeaderClickedListener(androidx.leanback.app.HeadersFragment.OnHeaderClickedListener!);
@@ -619,13 +597,10 @@
     method @Deprecated protected abstract android.view.View? onCreateForegroundView(android.view.LayoutInflater!, android.view.ViewGroup!);
     method @Deprecated protected android.animation.Animator? onCreateLogoAnimation();
     method @Deprecated protected android.animation.Animator! onCreateTitleAnimator();
-    method @Deprecated public android.view.View? onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
     method @Deprecated protected void onFinishFragment();
     method @Deprecated protected void onLogoAnimationFinished();
     method @Deprecated protected void onPageChanged(int, int);
     method @Deprecated public int onProvideTheme();
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle!);
-    method @Deprecated public void onViewCreated(android.view.View, android.os.Bundle?);
     method @Deprecated public void setArrowBackgroundColor(@ColorInt int);
     method @Deprecated public void setArrowColor(@ColorInt int);
     method @Deprecated public void setDescriptionViewTextColor(@ColorInt int);
@@ -689,17 +664,8 @@
     method @Deprecated public boolean isShowOrHideControlsOverlayOnUserInteraction();
     method @Deprecated public void notifyPlaybackRowChanged();
     method @Deprecated protected void onBufferingStateChanged(boolean);
-    method @Deprecated public void onCreate(android.os.Bundle!);
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onDestroy();
-    method @Deprecated public void onDestroyView();
     method @Deprecated protected void onError(int, CharSequence!);
-    method @Deprecated public void onPause();
-    method @Deprecated public void onResume();
-    method @Deprecated public void onStart();
-    method @Deprecated public void onStop();
     method @Deprecated protected void onVideoSizeChanged(int, int);
-    method @Deprecated public void onViewCreated(android.view.View, android.os.Bundle?);
     method @Deprecated public void setAdapter(androidx.leanback.widget.ObjectAdapter!);
     method @Deprecated public void setBackgroundType(int);
     method @Deprecated public void setControlsOverlayAutoHideEnabled(boolean);
@@ -725,19 +691,7 @@
   @Deprecated public class PlaybackFragmentGlueHost extends androidx.leanback.media.PlaybackGlueHost implements androidx.leanback.widget.PlaybackSeekUi {
     ctor @Deprecated public PlaybackFragmentGlueHost(androidx.leanback.app.PlaybackFragment!);
     method @Deprecated public void fadeOut();
-    method @Deprecated public androidx.leanback.media.PlaybackGlueHost.PlayerCallback! getPlayerCallback();
-    method @Deprecated public void hideControlsOverlay(boolean);
-    method @Deprecated public boolean isControlsOverlayAutoHideEnabled();
-    method @Deprecated public boolean isControlsOverlayVisible();
-    method @Deprecated public void notifyPlaybackRowChanged();
-    method @Deprecated public void setControlsOverlayAutoHideEnabled(boolean);
-    method @Deprecated public void setHostCallback(androidx.leanback.media.PlaybackGlueHost.HostCallback!);
-    method @Deprecated public void setOnActionClickedListener(androidx.leanback.widget.OnActionClickedListener!);
-    method @Deprecated public void setOnKeyInterceptListener(android.view.View.OnKeyListener!);
-    method @Deprecated public void setPlaybackRow(androidx.leanback.widget.Row!);
-    method @Deprecated public void setPlaybackRowPresenter(androidx.leanback.widget.PlaybackRowPresenter!);
     method @Deprecated public void setPlaybackSeekUiClient(androidx.leanback.widget.PlaybackSeekUi.Client!);
-    method @Deprecated public void showControlsOverlay(boolean);
   }
 
   public class PlaybackSupportFragment extends androidx.fragment.app.Fragment {
@@ -811,14 +765,9 @@
     method @Deprecated public int getSelectedPosition();
     method @Deprecated public final androidx.leanback.widget.VerticalGridView! getVerticalGridView();
     method @Deprecated public boolean isScrolling();
-    method @Deprecated public void onCreate(android.os.Bundle!);
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onDestroyView();
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle!);
     method @Deprecated public void onTransitionEnd();
     method @Deprecated public boolean onTransitionPrepare();
     method @Deprecated public void onTransitionStart();
-    method @Deprecated public void onViewCreated(android.view.View, android.os.Bundle?);
     method @Deprecated public final void setAdapter(androidx.leanback.widget.ObjectAdapter!);
     method @Deprecated public void setAlignment(int);
     method @Deprecated public void setEntranceTransitionState(boolean);
@@ -889,13 +838,6 @@
     method @Deprecated public androidx.leanback.app.RowsFragment! getRowsFragment();
     method @Deprecated public String! getTitle();
     method @Deprecated public static androidx.leanback.app.SearchFragment! newInstance(String!);
-    method @Deprecated public void onCreate(android.os.Bundle!);
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onDestroy();
-    method @Deprecated public void onPause();
-    method @Deprecated public void onRequestPermissionsResult(int, String[]!, int[]!);
-    method @Deprecated public void onResume();
-    method @Deprecated public void onStart();
     method @Deprecated public void setBadgeDrawable(android.graphics.drawable.Drawable!);
     method @Deprecated public void setOnItemViewClickedListener(androidx.leanback.widget.OnItemViewClickedListener!);
     method @Deprecated public void setOnItemViewSelectedListener(androidx.leanback.widget.OnItemViewSelectedListener!);
@@ -949,7 +891,6 @@
     method @Deprecated public androidx.leanback.widget.ObjectAdapter! getAdapter();
     method @Deprecated public androidx.leanback.widget.VerticalGridPresenter! getGridPresenter();
     method @Deprecated public androidx.leanback.widget.OnItemViewClickedListener! getOnItemViewClickedListener();
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
     method @Deprecated public void setAdapter(androidx.leanback.widget.ObjectAdapter!);
     method @Deprecated public void setGridPresenter(androidx.leanback.widget.VerticalGridPresenter!);
     method @Deprecated public void setOnItemViewClickedListener(androidx.leanback.widget.OnItemViewClickedListener!);
@@ -1127,10 +1068,6 @@
     method @Deprecated public long getSupportedActions();
     method @Deprecated public boolean hasValidMedia();
     method @Deprecated public boolean isMediaPlaying();
-    method @Deprecated public void next();
-    method @Deprecated public void pause();
-    method @Deprecated public void play(int);
-    method @Deprecated public void previous();
   }
 
   public class MediaPlayerAdapter extends androidx.leanback.media.PlayerAdapter {
@@ -1755,12 +1692,6 @@
     method @Deprecated public androidx.leanback.widget.OnActionClickedListener! getOnActionClickedListener();
     method @Deprecated public boolean isStyleLarge();
     method @Deprecated public final boolean isUsingDefaultSelectEffect();
-    method @Deprecated protected void onBindRowViewHolder(androidx.leanback.widget.RowPresenter.ViewHolder!, Object!);
-    method @Deprecated protected void onRowViewAttachedToWindow(androidx.leanback.widget.RowPresenter.ViewHolder!);
-    method @Deprecated protected void onRowViewDetachedFromWindow(androidx.leanback.widget.RowPresenter.ViewHolder!);
-    method @Deprecated protected void onRowViewSelected(androidx.leanback.widget.RowPresenter.ViewHolder!, boolean);
-    method @Deprecated protected void onSelectLevelChanged(androidx.leanback.widget.RowPresenter.ViewHolder!);
-    method @Deprecated protected void onUnbindRowViewHolder(androidx.leanback.widget.RowPresenter.ViewHolder!);
     method @Deprecated public void setBackgroundColor(@ColorInt int);
     method @Deprecated public void setOnActionClickedListener(androidx.leanback.widget.OnActionClickedListener!);
     method @Deprecated public final void setSharedElementEnterTransition(android.app.Activity!, String!, long);
diff --git a/legacy/core-ui/api/1.0.0.txt b/legacy/core-ui/api/1.0.0.txt
index 4e71f40..f255277 100644
--- a/legacy/core-ui/api/1.0.0.txt
+++ b/legacy/core-ui/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.legacy.app {
 
   @Deprecated public class ActionBarDrawerToggle implements androidx.drawerlayout.widget.DrawerLayout.DrawerListener {
@@ -35,8 +35,6 @@
     ctor @Deprecated public Space(android.content.Context, android.util.AttributeSet?, int);
     ctor @Deprecated public Space(android.content.Context, android.util.AttributeSet?);
     ctor @Deprecated public Space(android.content.Context);
-    method @Deprecated public void draw(android.graphics.Canvas!);
-    method @Deprecated protected void onMeasure(int, int);
   }
 
 }
diff --git a/legacy/core-ui/api/current.txt b/legacy/core-ui/api/current.txt
index 4e71f40..f255277 100644
--- a/legacy/core-ui/api/current.txt
+++ b/legacy/core-ui/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.legacy.app {
 
   @Deprecated public class ActionBarDrawerToggle implements androidx.drawerlayout.widget.DrawerLayout.DrawerListener {
@@ -35,8 +35,6 @@
     ctor @Deprecated public Space(android.content.Context, android.util.AttributeSet?, int);
     ctor @Deprecated public Space(android.content.Context, android.util.AttributeSet?);
     ctor @Deprecated public Space(android.content.Context);
-    method @Deprecated public void draw(android.graphics.Canvas!);
-    method @Deprecated protected void onMeasure(int, int);
   }
 
 }
diff --git a/legacy/core-utils/api/1.0.0.txt b/legacy/core-utils/api/1.0.0.txt
index f36337a..5e8a796 100644
--- a/legacy/core-utils/api/1.0.0.txt
+++ b/legacy/core-utils/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.legacy.content {
 
   @Deprecated public abstract class WakefulBroadcastReceiver extends android.content.BroadcastReceiver {
diff --git a/legacy/core-utils/api/current.txt b/legacy/core-utils/api/current.txt
index f36337a..5e8a796 100644
--- a/legacy/core-utils/api/current.txt
+++ b/legacy/core-utils/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.legacy.content {
 
   @Deprecated public abstract class WakefulBroadcastReceiver extends android.content.BroadcastReceiver {
diff --git a/legacy/v13/api/1.0.0.txt b/legacy/v13/api/1.0.0.txt
index d4892b1..87015e1 100644
--- a/legacy/v13/api/1.0.0.txt
+++ b/legacy/v13/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.legacy.app {
 
   @Deprecated public class ActivityCompat extends androidx.core.app.ActivityCompat {
@@ -24,42 +24,22 @@
 
   @Deprecated public abstract class FragmentPagerAdapter extends androidx.viewpager.widget.PagerAdapter {
     ctor @Deprecated public FragmentPagerAdapter(android.app.FragmentManager!);
-    method @Deprecated public void destroyItem(android.view.ViewGroup!, int, Object!);
-    method @Deprecated public void finishUpdate(android.view.ViewGroup!);
     method @Deprecated public abstract android.app.Fragment! getItem(int);
     method @Deprecated public long getItemId(int);
-    method @Deprecated public Object! instantiateItem(android.view.ViewGroup!, int);
     method @Deprecated public boolean isViewFromObject(android.view.View!, Object!);
-    method @Deprecated public void restoreState(android.os.Parcelable!, ClassLoader!);
-    method @Deprecated public android.os.Parcelable! saveState();
-    method @Deprecated public void setPrimaryItem(android.view.ViewGroup!, int, Object!);
-    method @Deprecated public void startUpdate(android.view.ViewGroup!);
   }
 
   @Deprecated public abstract class FragmentStatePagerAdapter extends androidx.viewpager.widget.PagerAdapter {
     ctor @Deprecated public FragmentStatePagerAdapter(android.app.FragmentManager!);
-    method @Deprecated public void destroyItem(android.view.ViewGroup!, int, Object!);
-    method @Deprecated public void finishUpdate(android.view.ViewGroup!);
     method @Deprecated public abstract android.app.Fragment! getItem(int);
-    method @Deprecated public Object! instantiateItem(android.view.ViewGroup!, int);
     method @Deprecated public boolean isViewFromObject(android.view.View!, Object!);
-    method @Deprecated public void restoreState(android.os.Parcelable!, ClassLoader!);
-    method @Deprecated public android.os.Parcelable! saveState();
-    method @Deprecated public void setPrimaryItem(android.view.ViewGroup!, int, Object!);
-    method @Deprecated public void startUpdate(android.view.ViewGroup!);
   }
 
   @Deprecated public class FragmentTabHost extends android.widget.TabHost implements android.widget.TabHost.OnTabChangeListener {
     ctor @Deprecated public FragmentTabHost(android.content.Context!);
     ctor @Deprecated public FragmentTabHost(android.content.Context!, android.util.AttributeSet!);
     method @Deprecated public void addTab(android.widget.TabHost.TabSpec!, Class<?>!, android.os.Bundle!);
-    method @Deprecated protected void onAttachedToWindow();
-    method @Deprecated protected void onDetachedFromWindow();
-    method @Deprecated protected void onRestoreInstanceState(android.os.Parcelable!);
-    method @Deprecated protected android.os.Parcelable! onSaveInstanceState();
     method @Deprecated public void onTabChanged(String!);
-    method @Deprecated public void setOnTabChangedListener(android.widget.TabHost.OnTabChangeListener!);
-    method @Deprecated public void setup();
     method @Deprecated public void setup(android.content.Context!, android.app.FragmentManager!);
     method @Deprecated public void setup(android.content.Context!, android.app.FragmentManager!, int);
   }
diff --git a/legacy/v13/api/current.txt b/legacy/v13/api/current.txt
index d4892b1..87015e1 100644
--- a/legacy/v13/api/current.txt
+++ b/legacy/v13/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.legacy.app {
 
   @Deprecated public class ActivityCompat extends androidx.core.app.ActivityCompat {
@@ -24,42 +24,22 @@
 
   @Deprecated public abstract class FragmentPagerAdapter extends androidx.viewpager.widget.PagerAdapter {
     ctor @Deprecated public FragmentPagerAdapter(android.app.FragmentManager!);
-    method @Deprecated public void destroyItem(android.view.ViewGroup!, int, Object!);
-    method @Deprecated public void finishUpdate(android.view.ViewGroup!);
     method @Deprecated public abstract android.app.Fragment! getItem(int);
     method @Deprecated public long getItemId(int);
-    method @Deprecated public Object! instantiateItem(android.view.ViewGroup!, int);
     method @Deprecated public boolean isViewFromObject(android.view.View!, Object!);
-    method @Deprecated public void restoreState(android.os.Parcelable!, ClassLoader!);
-    method @Deprecated public android.os.Parcelable! saveState();
-    method @Deprecated public void setPrimaryItem(android.view.ViewGroup!, int, Object!);
-    method @Deprecated public void startUpdate(android.view.ViewGroup!);
   }
 
   @Deprecated public abstract class FragmentStatePagerAdapter extends androidx.viewpager.widget.PagerAdapter {
     ctor @Deprecated public FragmentStatePagerAdapter(android.app.FragmentManager!);
-    method @Deprecated public void destroyItem(android.view.ViewGroup!, int, Object!);
-    method @Deprecated public void finishUpdate(android.view.ViewGroup!);
     method @Deprecated public abstract android.app.Fragment! getItem(int);
-    method @Deprecated public Object! instantiateItem(android.view.ViewGroup!, int);
     method @Deprecated public boolean isViewFromObject(android.view.View!, Object!);
-    method @Deprecated public void restoreState(android.os.Parcelable!, ClassLoader!);
-    method @Deprecated public android.os.Parcelable! saveState();
-    method @Deprecated public void setPrimaryItem(android.view.ViewGroup!, int, Object!);
-    method @Deprecated public void startUpdate(android.view.ViewGroup!);
   }
 
   @Deprecated public class FragmentTabHost extends android.widget.TabHost implements android.widget.TabHost.OnTabChangeListener {
     ctor @Deprecated public FragmentTabHost(android.content.Context!);
     ctor @Deprecated public FragmentTabHost(android.content.Context!, android.util.AttributeSet!);
     method @Deprecated public void addTab(android.widget.TabHost.TabSpec!, Class<?>!, android.os.Bundle!);
-    method @Deprecated protected void onAttachedToWindow();
-    method @Deprecated protected void onDetachedFromWindow();
-    method @Deprecated protected void onRestoreInstanceState(android.os.Parcelable!);
-    method @Deprecated protected android.os.Parcelable! onSaveInstanceState();
     method @Deprecated public void onTabChanged(String!);
-    method @Deprecated public void setOnTabChangedListener(android.widget.TabHost.OnTabChangeListener!);
-    method @Deprecated public void setup();
     method @Deprecated public void setup(android.content.Context!, android.app.FragmentManager!);
     method @Deprecated public void setup(android.content.Context!, android.app.FragmentManager!, int);
   }
diff --git a/lifecycle/common-java8/api/2.1.0-alpha02.txt b/lifecycle/common-java8/api/2.1.0-alpha02.txt
index 2df8249..498d3a9 100644
--- a/lifecycle/common-java8/api/2.1.0-alpha02.txt
+++ b/lifecycle/common-java8/api/2.1.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public interface DefaultLifecycleObserver extends androidx.lifecycle.LifecycleObserver androidx.lifecycle.LifecycleObserver {
diff --git a/lifecycle/common-java8/api/current.txt b/lifecycle/common-java8/api/current.txt
index 2df8249..498d3a9 100644
--- a/lifecycle/common-java8/api/current.txt
+++ b/lifecycle/common-java8/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public interface DefaultLifecycleObserver extends androidx.lifecycle.LifecycleObserver androidx.lifecycle.LifecycleObserver {
diff --git a/lifecycle/common/api/2.1.0-alpha02.txt b/lifecycle/common/api/2.1.0-alpha02.txt
index 3003f83..f23b5eb 100644
--- a/lifecycle/common/api/2.1.0-alpha02.txt
+++ b/lifecycle/common/api/2.1.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public abstract class Lifecycle {
@@ -8,7 +8,7 @@
     method @MainThread public abstract void removeObserver(androidx.lifecycle.LifecycleObserver);
   }
 
-  public static enum Lifecycle.Event {
+  public enum Lifecycle.Event {
     enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_ANY;
     enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_CREATE;
     enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_DESTROY;
@@ -18,7 +18,7 @@
     enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_STOP;
   }
 
-  public static enum Lifecycle.State {
+  public enum Lifecycle.State {
     method public boolean isAtLeast(androidx.lifecycle.Lifecycle.State);
     enum_constant public static final androidx.lifecycle.Lifecycle.State CREATED;
     enum_constant public static final androidx.lifecycle.Lifecycle.State DESTROYED;
diff --git a/lifecycle/common/api/current.txt b/lifecycle/common/api/current.txt
index 3003f83..f23b5eb 100644
--- a/lifecycle/common/api/current.txt
+++ b/lifecycle/common/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public abstract class Lifecycle {
@@ -8,7 +8,7 @@
     method @MainThread public abstract void removeObserver(androidx.lifecycle.LifecycleObserver);
   }
 
-  public static enum Lifecycle.Event {
+  public enum Lifecycle.Event {
     enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_ANY;
     enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_CREATE;
     enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_DESTROY;
@@ -18,7 +18,7 @@
     enum_constant public static final androidx.lifecycle.Lifecycle.Event ON_STOP;
   }
 
-  public static enum Lifecycle.State {
+  public enum Lifecycle.State {
     method public boolean isAtLeast(androidx.lifecycle.Lifecycle.State);
     enum_constant public static final androidx.lifecycle.Lifecycle.State CREATED;
     enum_constant public static final androidx.lifecycle.Lifecycle.State DESTROYED;
diff --git a/lifecycle/extensions/api/2.1.0-alpha02.txt b/lifecycle/extensions/api/2.1.0-alpha02.txt
index c3b2a11..c85f1ab 100644
--- a/lifecycle/extensions/api/2.1.0-alpha02.txt
+++ b/lifecycle/extensions/api/2.1.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public class ViewModelProviders {
diff --git a/lifecycle/extensions/api/current.txt b/lifecycle/extensions/api/current.txt
index c3b2a11..c85f1ab 100644
--- a/lifecycle/extensions/api/current.txt
+++ b/lifecycle/extensions/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public class ViewModelProviders {
diff --git a/lifecycle/livedata-core/api/2.1.0-alpha02.txt b/lifecycle/livedata-core/api/2.1.0-alpha02.txt
index b59c9e6..f0db7db 100644
--- a/lifecycle/livedata-core/api/2.1.0-alpha02.txt
+++ b/lifecycle/livedata-core/api/2.1.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public abstract class LiveData<T> {
diff --git a/lifecycle/livedata-core/api/current.txt b/lifecycle/livedata-core/api/current.txt
index b59c9e6..f0db7db 100644
--- a/lifecycle/livedata-core/api/current.txt
+++ b/lifecycle/livedata-core/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public abstract class LiveData<T> {
diff --git a/lifecycle/livedata-core/ktx/api/2.1.0-alpha02.txt b/lifecycle/livedata-core/ktx/api/2.1.0-alpha02.txt
index 50f7bde..861a341 100644
--- a/lifecycle/livedata-core/ktx/api/2.1.0-alpha02.txt
+++ b/lifecycle/livedata-core/ktx/api/2.1.0-alpha02.txt
@@ -1,9 +1,9 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public final class LiveDataKt {
     ctor public LiveDataKt();
-    method @MainThread public static <T> androidx.lifecycle.Observer<T> observe(androidx.lifecycle.LiveData<T>, androidx.lifecycle.LifecycleOwner owner, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> onChanged);
+    method @MainThread public static inline <T> androidx.lifecycle.Observer<T> observe(androidx.lifecycle.LiveData<T>, androidx.lifecycle.LifecycleOwner owner, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> onChanged);
   }
 
 }
diff --git a/lifecycle/livedata-core/ktx/api/current.txt b/lifecycle/livedata-core/ktx/api/current.txt
index 50f7bde..861a341 100644
--- a/lifecycle/livedata-core/ktx/api/current.txt
+++ b/lifecycle/livedata-core/ktx/api/current.txt
@@ -1,9 +1,9 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public final class LiveDataKt {
     ctor public LiveDataKt();
-    method @MainThread public static <T> androidx.lifecycle.Observer<T> observe(androidx.lifecycle.LiveData<T>, androidx.lifecycle.LifecycleOwner owner, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> onChanged);
+    method @MainThread public static inline <T> androidx.lifecycle.Observer<T> observe(androidx.lifecycle.LiveData<T>, androidx.lifecycle.LifecycleOwner owner, kotlin.jvm.functions.Function1<? super T,kotlin.Unit> onChanged);
   }
 
 }
diff --git a/lifecycle/livedata/api/2.1.0-alpha02.txt b/lifecycle/livedata/api/2.1.0-alpha02.txt
index 5c4ba0d..2f5616b 100644
--- a/lifecycle/livedata/api/2.1.0-alpha02.txt
+++ b/lifecycle/livedata/api/2.1.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public class MediatorLiveData<T> extends androidx.lifecycle.MutableLiveData<T> {
diff --git a/lifecycle/livedata/api/current.txt b/lifecycle/livedata/api/current.txt
index 5c4ba0d..2f5616b 100644
--- a/lifecycle/livedata/api/current.txt
+++ b/lifecycle/livedata/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public class MediatorLiveData<T> extends androidx.lifecycle.MutableLiveData<T> {
diff --git a/lifecycle/livedata/ktx/api/2.1.0-alpha02.txt b/lifecycle/livedata/ktx/api/2.1.0-alpha02.txt
index ef528c1..a21c943 100644
--- a/lifecycle/livedata/ktx/api/2.1.0-alpha02.txt
+++ b/lifecycle/livedata/ktx/api/2.1.0-alpha02.txt
@@ -1,11 +1,11 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public final class TransformationsKt {
     ctor public TransformationsKt();
-    method public static <X> androidx.lifecycle.LiveData<X> distinctUntilChanged(androidx.lifecycle.LiveData<X>);
-    method public static <X, Y> androidx.lifecycle.LiveData<Y> map(androidx.lifecycle.LiveData<X>, kotlin.jvm.functions.Function1<? super X,? extends Y> transform);
-    method public static <X, Y> androidx.lifecycle.LiveData<Y> switchMap(androidx.lifecycle.LiveData<X>, kotlin.jvm.functions.Function1<? super X,? extends androidx.lifecycle.LiveData<Y>> transform);
+    method public static inline <X> androidx.lifecycle.LiveData<X> distinctUntilChanged(androidx.lifecycle.LiveData<X>);
+    method public static inline <X, Y> androidx.lifecycle.LiveData<Y> map(androidx.lifecycle.LiveData<X>, kotlin.jvm.functions.Function1<? super X,? extends Y> transform);
+    method public static inline <X, Y> androidx.lifecycle.LiveData<Y> switchMap(androidx.lifecycle.LiveData<X>, kotlin.jvm.functions.Function1<? super X,? extends androidx.lifecycle.LiveData<Y>> transform);
   }
 
 }
diff --git a/lifecycle/livedata/ktx/api/current.txt b/lifecycle/livedata/ktx/api/current.txt
index ef528c1..a21c943 100644
--- a/lifecycle/livedata/ktx/api/current.txt
+++ b/lifecycle/livedata/ktx/api/current.txt
@@ -1,11 +1,11 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public final class TransformationsKt {
     ctor public TransformationsKt();
-    method public static <X> androidx.lifecycle.LiveData<X> distinctUntilChanged(androidx.lifecycle.LiveData<X>);
-    method public static <X, Y> androidx.lifecycle.LiveData<Y> map(androidx.lifecycle.LiveData<X>, kotlin.jvm.functions.Function1<? super X,? extends Y> transform);
-    method public static <X, Y> androidx.lifecycle.LiveData<Y> switchMap(androidx.lifecycle.LiveData<X>, kotlin.jvm.functions.Function1<? super X,? extends androidx.lifecycle.LiveData<Y>> transform);
+    method public static inline <X> androidx.lifecycle.LiveData<X> distinctUntilChanged(androidx.lifecycle.LiveData<X>);
+    method public static inline <X, Y> androidx.lifecycle.LiveData<Y> map(androidx.lifecycle.LiveData<X>, kotlin.jvm.functions.Function1<? super X,? extends Y> transform);
+    method public static inline <X, Y> androidx.lifecycle.LiveData<Y> switchMap(androidx.lifecycle.LiveData<X>, kotlin.jvm.functions.Function1<? super X,? extends androidx.lifecycle.LiveData<Y>> transform);
   }
 
 }
diff --git a/lifecycle/process/api/2.1.0-alpha02.txt b/lifecycle/process/api/2.1.0-alpha02.txt
index ee2ae90..beea619 100644
--- a/lifecycle/process/api/2.1.0-alpha02.txt
+++ b/lifecycle/process/api/2.1.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public class ProcessLifecycleOwner implements androidx.lifecycle.LifecycleOwner {
diff --git a/lifecycle/process/api/current.txt b/lifecycle/process/api/current.txt
index ee2ae90..beea619 100644
--- a/lifecycle/process/api/current.txt
+++ b/lifecycle/process/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public class ProcessLifecycleOwner implements androidx.lifecycle.LifecycleOwner {
diff --git a/lifecycle/reactivestreams/api/2.1.0-alpha02.txt b/lifecycle/reactivestreams/api/2.1.0-alpha02.txt
index ac0dbcb..f3d107a 100644
--- a/lifecycle/reactivestreams/api/2.1.0-alpha02.txt
+++ b/lifecycle/reactivestreams/api/2.1.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public final class LiveDataReactiveStreams {
diff --git a/lifecycle/reactivestreams/api/current.txt b/lifecycle/reactivestreams/api/current.txt
index ac0dbcb..f3d107a 100644
--- a/lifecycle/reactivestreams/api/current.txt
+++ b/lifecycle/reactivestreams/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public final class LiveDataReactiveStreams {
diff --git a/lifecycle/reactivestreams/ktx/api/2.1.0-alpha02.txt b/lifecycle/reactivestreams/ktx/api/2.1.0-alpha02.txt
index c137b3362..659d07d 100644
--- a/lifecycle/reactivestreams/ktx/api/2.1.0-alpha02.txt
+++ b/lifecycle/reactivestreams/ktx/api/2.1.0-alpha02.txt
@@ -1,10 +1,10 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public final class LiveDataReactiveSteamsKt {
     ctor public LiveDataReactiveSteamsKt();
-    method public static <T> androidx.lifecycle.LiveData<T> toLiveData(org.reactivestreams.Publisher<T>);
-    method public static <T> org.reactivestreams.Publisher<T> toPublisher(androidx.lifecycle.LiveData<T>, androidx.lifecycle.LifecycleOwner lifecycle);
+    method public static inline <T> androidx.lifecycle.LiveData<T> toLiveData(org.reactivestreams.Publisher<T>);
+    method public static inline <T> org.reactivestreams.Publisher<T> toPublisher(androidx.lifecycle.LiveData<T>, androidx.lifecycle.LifecycleOwner lifecycle);
   }
 
 }
diff --git a/lifecycle/reactivestreams/ktx/api/current.txt b/lifecycle/reactivestreams/ktx/api/current.txt
index c137b3362..659d07d 100644
--- a/lifecycle/reactivestreams/ktx/api/current.txt
+++ b/lifecycle/reactivestreams/ktx/api/current.txt
@@ -1,10 +1,10 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public final class LiveDataReactiveSteamsKt {
     ctor public LiveDataReactiveSteamsKt();
-    method public static <T> androidx.lifecycle.LiveData<T> toLiveData(org.reactivestreams.Publisher<T>);
-    method public static <T> org.reactivestreams.Publisher<T> toPublisher(androidx.lifecycle.LiveData<T>, androidx.lifecycle.LifecycleOwner lifecycle);
+    method public static inline <T> androidx.lifecycle.LiveData<T> toLiveData(org.reactivestreams.Publisher<T>);
+    method public static inline <T> org.reactivestreams.Publisher<T> toPublisher(androidx.lifecycle.LiveData<T>, androidx.lifecycle.LifecycleOwner lifecycle);
   }
 
 }
diff --git a/lifecycle/runtime/api/2.1.0-alpha02.txt b/lifecycle/runtime/api/2.1.0-alpha02.txt
index 8b9aee1..0a652c0 100644
--- a/lifecycle/runtime/api/2.1.0-alpha02.txt
+++ b/lifecycle/runtime/api/2.1.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public class LifecycleRegistry extends androidx.lifecycle.Lifecycle {
diff --git a/lifecycle/runtime/api/current.txt b/lifecycle/runtime/api/current.txt
index 8b9aee1..0a652c0 100644
--- a/lifecycle/runtime/api/current.txt
+++ b/lifecycle/runtime/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public class LifecycleRegistry extends androidx.lifecycle.Lifecycle {
diff --git a/lifecycle/service/api/2.1.0-alpha02.txt b/lifecycle/service/api/2.1.0-alpha02.txt
index b7273c0..a12d86e 100644
--- a/lifecycle/service/api/2.1.0-alpha02.txt
+++ b/lifecycle/service/api/2.1.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public class LifecycleService extends android.app.Service implements androidx.lifecycle.LifecycleOwner {
diff --git a/lifecycle/service/api/current.txt b/lifecycle/service/api/current.txt
index b7273c0..a12d86e 100644
--- a/lifecycle/service/api/current.txt
+++ b/lifecycle/service/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public class LifecycleService extends android.app.Service implements androidx.lifecycle.LifecycleOwner {
diff --git a/lifecycle/viewmodel/api/2.1.0-alpha02.txt b/lifecycle/viewmodel/api/2.1.0-alpha02.txt
index 1dea887..0a6e010 100644
--- a/lifecycle/viewmodel/api/2.1.0-alpha02.txt
+++ b/lifecycle/viewmodel/api/2.1.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public class AndroidViewModel extends androidx.lifecycle.ViewModel {
diff --git a/lifecycle/viewmodel/api/current.txt b/lifecycle/viewmodel/api/current.txt
index 1dea887..0a6e010 100644
--- a/lifecycle/viewmodel/api/current.txt
+++ b/lifecycle/viewmodel/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public class AndroidViewModel extends androidx.lifecycle.ViewModel {
diff --git a/lifecycle/viewmodel/ktx/api/2.1.0-alpha02.txt b/lifecycle/viewmodel/ktx/api/2.1.0-alpha02.txt
index 61e351d..2c78583 100644
--- a/lifecycle/viewmodel/ktx/api/2.1.0-alpha02.txt
+++ b/lifecycle/viewmodel/ktx/api/2.1.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public final class ViewModelKt {
@@ -15,6 +15,7 @@
 
   public final class ViewModelProviderKt {
     ctor public ViewModelProviderKt();
+    method @MainThread public static inline <reified VM extends androidx.lifecycle.ViewModel> VM! get(androidx.lifecycle.ViewModelProvider);
   }
 
 }
diff --git a/lifecycle/viewmodel/ktx/api/current.txt b/lifecycle/viewmodel/ktx/api/current.txt
index 61e351d..2c78583 100644
--- a/lifecycle/viewmodel/ktx/api/current.txt
+++ b/lifecycle/viewmodel/ktx/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.lifecycle {
 
   public final class ViewModelKt {
@@ -15,6 +15,7 @@
 
   public final class ViewModelProviderKt {
     ctor public ViewModelProviderKt();
+    method @MainThread public static inline <reified VM extends androidx.lifecycle.ViewModel> VM! get(androidx.lifecycle.ViewModelProvider);
   }
 
 }
diff --git a/loader/api/1.1.0-beta01.txt b/loader/api/1.1.0-beta01.txt
index 1bc56b87..8b3df8a 100644
--- a/loader/api/1.1.0-beta01.txt
+++ b/loader/api/1.1.0-beta01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.loader.app {
 
   public abstract class LoaderManager {
diff --git a/loader/api/current.txt b/loader/api/current.txt
index 1bc56b87..8b3df8a 100644
--- a/loader/api/current.txt
+++ b/loader/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.loader.app {
 
   public abstract class LoaderManager {
diff --git a/localbroadcastmanager/api/1.1.0-alpha01.txt b/localbroadcastmanager/api/1.1.0-alpha01.txt
index 3e3571d..665dd3c 100644
--- a/localbroadcastmanager/api/1.1.0-alpha01.txt
+++ b/localbroadcastmanager/api/1.1.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.localbroadcastmanager.content {
 
   @Deprecated public final class LocalBroadcastManager {
diff --git a/localbroadcastmanager/api/current.txt b/localbroadcastmanager/api/current.txt
index 3e3571d..665dd3c 100644
--- a/localbroadcastmanager/api/current.txt
+++ b/localbroadcastmanager/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.localbroadcastmanager.content {
 
   @Deprecated public final class LocalBroadcastManager {
diff --git a/media/api/1.1.0-alpha01.txt b/media/api/1.1.0-alpha01.txt
index 0d77d11..c4e14c0 100644
--- a/media/api/1.1.0-alpha01.txt
+++ b/media/api/1.1.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package android.support.v4.media {
 
   public final class MediaBrowserCompat {
diff --git a/media/api/current.txt b/media/api/current.txt
index 0d77d11..c4e14c0 100644
--- a/media/api/current.txt
+++ b/media/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package android.support.v4.media {
 
   public final class MediaBrowserCompat {
diff --git a/media2-widget/api/1.0.0-alpha07.txt b/media2-widget/api/1.0.0-alpha07.txt
index f1f22f0..cccfb1d 100644
--- a/media2-widget/api/1.0.0-alpha07.txt
+++ b/media2-widget/api/1.0.0-alpha07.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.media2.widget {
 
   public class MediaControlView extends android.view.ViewGroup {
diff --git a/media2-widget/api/current.txt b/media2-widget/api/current.txt
index f1f22f0..cccfb1d 100644
--- a/media2-widget/api/current.txt
+++ b/media2-widget/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.media2.widget {
 
   public class MediaControlView extends android.view.ViewGroup {
diff --git a/media2/api/1.0.0-alpha05.txt b/media2/api/1.0.0-alpha05.txt
index 48e9b5b..fbf4c3f 100644
--- a/media2/api/1.0.0-alpha05.txt
+++ b/media2/api/1.0.0-alpha05.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.media2 {
 
   public class CallbackMediaItem extends androidx.media2.MediaItem {
@@ -8,9 +8,6 @@
   public static final class CallbackMediaItem.Builder {
     ctor public CallbackMediaItem.Builder(androidx.media2.DataSourceCallback);
     method public androidx.media2.CallbackMediaItem build();
-    method public androidx.media2.CallbackMediaItem.Builder! setEndPosition(long);
-    method public androidx.media2.CallbackMediaItem.Builder! setMetadata(androidx.media2.MediaMetadata!);
-    method public androidx.media2.CallbackMediaItem.Builder! setStartPosition(long);
   }
 
   public abstract class DataSourceCallback implements java.io.Closeable {
@@ -30,9 +27,6 @@
     ctor public FileMediaItem.Builder(android.os.ParcelFileDescriptor);
     ctor public FileMediaItem.Builder(android.os.ParcelFileDescriptor, long, long);
     method public androidx.media2.FileMediaItem build();
-    method public androidx.media2.FileMediaItem.Builder! setEndPosition(long);
-    method public androidx.media2.FileMediaItem.Builder! setMetadata(androidx.media2.MediaMetadata!);
-    method public androidx.media2.FileMediaItem.Builder! setStartPosition(long);
   }
 
   public final class HeartRating implements androidx.media2.Rating {
@@ -177,9 +171,6 @@
   public static class MediaItem.Builder {
     ctor public MediaItem.Builder();
     method public androidx.media2.MediaItem! build();
-    method public androidx.media2.MediaItem.Builder! setEndPosition(long);
-    method public androidx.media2.MediaItem.Builder! setMetadata(androidx.media2.MediaMetadata!);
-    method public androidx.media2.MediaItem.Builder! setStartPosition(long);
   }
 
   public abstract class MediaLibraryService extends androidx.media2.MediaSessionService {
@@ -733,9 +724,6 @@
     ctor public UriMediaItem.Builder(android.content.Context, android.net.Uri);
     ctor public UriMediaItem.Builder(android.content.Context, android.net.Uri, java.util.Map<java.lang.String,java.lang.String>?, java.util.List<java.net.HttpCookie>?);
     method public androidx.media2.UriMediaItem build();
-    method public androidx.media2.UriMediaItem.Builder! setEndPosition(long);
-    method public androidx.media2.UriMediaItem.Builder! setMetadata(androidx.media2.MediaMetadata!);
-    method public androidx.media2.UriMediaItem.Builder! setStartPosition(long);
   }
 
   public final class VideoSize {
diff --git a/media2/api/current.txt b/media2/api/current.txt
index 48e9b5b..fbf4c3f 100644
--- a/media2/api/current.txt
+++ b/media2/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.media2 {
 
   public class CallbackMediaItem extends androidx.media2.MediaItem {
@@ -8,9 +8,6 @@
   public static final class CallbackMediaItem.Builder {
     ctor public CallbackMediaItem.Builder(androidx.media2.DataSourceCallback);
     method public androidx.media2.CallbackMediaItem build();
-    method public androidx.media2.CallbackMediaItem.Builder! setEndPosition(long);
-    method public androidx.media2.CallbackMediaItem.Builder! setMetadata(androidx.media2.MediaMetadata!);
-    method public androidx.media2.CallbackMediaItem.Builder! setStartPosition(long);
   }
 
   public abstract class DataSourceCallback implements java.io.Closeable {
@@ -30,9 +27,6 @@
     ctor public FileMediaItem.Builder(android.os.ParcelFileDescriptor);
     ctor public FileMediaItem.Builder(android.os.ParcelFileDescriptor, long, long);
     method public androidx.media2.FileMediaItem build();
-    method public androidx.media2.FileMediaItem.Builder! setEndPosition(long);
-    method public androidx.media2.FileMediaItem.Builder! setMetadata(androidx.media2.MediaMetadata!);
-    method public androidx.media2.FileMediaItem.Builder! setStartPosition(long);
   }
 
   public final class HeartRating implements androidx.media2.Rating {
@@ -177,9 +171,6 @@
   public static class MediaItem.Builder {
     ctor public MediaItem.Builder();
     method public androidx.media2.MediaItem! build();
-    method public androidx.media2.MediaItem.Builder! setEndPosition(long);
-    method public androidx.media2.MediaItem.Builder! setMetadata(androidx.media2.MediaMetadata!);
-    method public androidx.media2.MediaItem.Builder! setStartPosition(long);
   }
 
   public abstract class MediaLibraryService extends androidx.media2.MediaSessionService {
@@ -733,9 +724,6 @@
     ctor public UriMediaItem.Builder(android.content.Context, android.net.Uri);
     ctor public UriMediaItem.Builder(android.content.Context, android.net.Uri, java.util.Map<java.lang.String,java.lang.String>?, java.util.List<java.net.HttpCookie>?);
     method public androidx.media2.UriMediaItem build();
-    method public androidx.media2.UriMediaItem.Builder! setEndPosition(long);
-    method public androidx.media2.UriMediaItem.Builder! setMetadata(androidx.media2.MediaMetadata!);
-    method public androidx.media2.UriMediaItem.Builder! setStartPosition(long);
   }
 
   public final class VideoSize {
diff --git a/mediarouter/api/1.1.0-alpha01.txt b/mediarouter/api/1.1.0-alpha01.txt
index 4a73f6a..c5be66c 100644
--- a/mediarouter/api/1.1.0-alpha01.txt
+++ b/mediarouter/api/1.1.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.mediarouter.app {
 
   public class MediaRouteActionProvider extends androidx.core.view.ActionProvider {
diff --git a/mediarouter/api/current.txt b/mediarouter/api/current.txt
index 4a73f6a..c5be66c 100644
--- a/mediarouter/api/current.txt
+++ b/mediarouter/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.mediarouter.app {
 
   public class MediaRouteActionProvider extends androidx.core.view.ActionProvider {
diff --git a/navigation/common/api/1.0.0-alpha08.txt b/navigation/common/api/1.0.0-alpha08.txt
index d5e17ab..afd5999 100644
--- a/navigation/common/api/1.0.0-alpha08.txt
+++ b/navigation/common/api/1.0.0-alpha08.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   public final class NavAction {
diff --git a/navigation/common/api/1.0.0-alpha09.txt b/navigation/common/api/1.0.0-alpha09.txt
index 436cda3..b9499b6 100644
--- a/navigation/common/api/1.0.0-alpha09.txt
+++ b/navigation/common/api/1.0.0-alpha09.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   public final class NavAction {
diff --git a/navigation/common/api/1.0.0-alpha10.txt b/navigation/common/api/1.0.0-alpha10.txt
index 67258d3..6dd3420 100644
--- a/navigation/common/api/1.0.0-alpha10.txt
+++ b/navigation/common/api/1.0.0-alpha10.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   public final class ActionOnlyNavDirections implements androidx.navigation.NavDirections {
diff --git a/navigation/common/api/1.0.0-alpha11.txt b/navigation/common/api/1.0.0-alpha11.txt
index 67258d3..6dd3420 100644
--- a/navigation/common/api/1.0.0-alpha11.txt
+++ b/navigation/common/api/1.0.0-alpha11.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   public final class ActionOnlyNavDirections implements androidx.navigation.NavDirections {
diff --git a/navigation/common/api/current.txt b/navigation/common/api/current.txt
index 67258d3..6dd3420 100644
--- a/navigation/common/api/current.txt
+++ b/navigation/common/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   public final class ActionOnlyNavDirections implements androidx.navigation.NavDirections {
diff --git a/navigation/common/ktx/api/1.0.0-alpha08.txt b/navigation/common/ktx/api/1.0.0-alpha08.txt
index 503aca4..a114147 100644
--- a/navigation/common/ktx/api/1.0.0-alpha08.txt
+++ b/navigation/common/ktx/api/1.0.0-alpha08.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   @androidx.navigation.NavOptionsDsl public final class AnimBuilder {
diff --git a/navigation/common/ktx/api/1.0.0-alpha09.txt b/navigation/common/ktx/api/1.0.0-alpha09.txt
index 931b33c..f59538e 100644
--- a/navigation/common/ktx/api/1.0.0-alpha09.txt
+++ b/navigation/common/ktx/api/1.0.0-alpha09.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   @androidx.navigation.NavOptionsDsl public final class AnimBuilder {
diff --git a/navigation/common/ktx/api/1.0.0-alpha10.txt b/navigation/common/ktx/api/1.0.0-alpha10.txt
index b9914ba..12ddf7b 100644
--- a/navigation/common/ktx/api/1.0.0-alpha10.txt
+++ b/navigation/common/ktx/api/1.0.0-alpha10.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   @androidx.navigation.NavOptionsDsl public final class AnimBuilder {
diff --git a/navigation/common/ktx/api/1.0.0-alpha11.txt b/navigation/common/ktx/api/1.0.0-alpha11.txt
index b9914ba..6da57db 100644
--- a/navigation/common/ktx/api/1.0.0-alpha11.txt
+++ b/navigation/common/ktx/api/1.0.0-alpha11.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   @androidx.navigation.NavOptionsDsl public final class AnimBuilder {
@@ -77,17 +77,17 @@
 
   public final class NavGraphBuilderKt {
     ctor public NavGraphBuilderKt();
-    method public static androidx.navigation.NavGraph navigation(androidx.navigation.NavigatorProvider, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
-    method public static void navigation(androidx.navigation.NavGraphBuilder, @IdRes int id, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+    method public static inline androidx.navigation.NavGraph navigation(androidx.navigation.NavigatorProvider, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+    method public static inline void navigation(androidx.navigation.NavGraphBuilder, @IdRes int id, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
   }
 
   public final class NavGraphKt {
     ctor public NavGraphKt();
     method public static operator boolean contains(androidx.navigation.NavGraph, @IdRes int id);
-    method public static operator androidx.navigation.NavDestination get(androidx.navigation.NavGraph, @IdRes int id);
-    method public static operator void minusAssign(androidx.navigation.NavGraph, androidx.navigation.NavDestination node);
-    method public static operator void plusAssign(androidx.navigation.NavGraph, androidx.navigation.NavDestination node);
-    method public static operator void plusAssign(androidx.navigation.NavGraph, androidx.navigation.NavGraph other);
+    method public static inline operator androidx.navigation.NavDestination get(androidx.navigation.NavGraph, @IdRes int id);
+    method public static inline operator void minusAssign(androidx.navigation.NavGraph, androidx.navigation.NavDestination node);
+    method public static inline operator void plusAssign(androidx.navigation.NavGraph, androidx.navigation.NavDestination node);
+    method public static inline operator void plusAssign(androidx.navigation.NavGraph, androidx.navigation.NavGraph other);
   }
 
   @androidx.navigation.NavOptionsDsl public final class NavOptionsBuilder {
@@ -112,10 +112,10 @@
 
   public final class NavigatorProviderKt {
     ctor public NavigatorProviderKt();
-    method public static operator <T extends androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>> T get(androidx.navigation.NavigatorProvider, String name);
-    method public static operator <T extends androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>> T get(androidx.navigation.NavigatorProvider, kotlin.reflect.KClass<T> clazz);
-    method public static operator void plusAssign(androidx.navigation.NavigatorProvider, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
-    method public static operator androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>? set(androidx.navigation.NavigatorProvider, String name, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
+    method public static inline operator <T extends androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>> T get(androidx.navigation.NavigatorProvider, String name);
+    method public static inline operator <T extends androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>> T get(androidx.navigation.NavigatorProvider, kotlin.reflect.KClass<T> clazz);
+    method public static inline operator void plusAssign(androidx.navigation.NavigatorProvider, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
+    method public static inline operator androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>? set(androidx.navigation.NavigatorProvider, String name, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
   }
 
   @androidx.navigation.NavOptionsDsl public final class PopUpToBuilder {
diff --git a/navigation/common/ktx/api/current.txt b/navigation/common/ktx/api/current.txt
index b9914ba..6da57db 100644
--- a/navigation/common/ktx/api/current.txt
+++ b/navigation/common/ktx/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   @androidx.navigation.NavOptionsDsl public final class AnimBuilder {
@@ -77,17 +77,17 @@
 
   public final class NavGraphBuilderKt {
     ctor public NavGraphBuilderKt();
-    method public static androidx.navigation.NavGraph navigation(androidx.navigation.NavigatorProvider, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
-    method public static void navigation(androidx.navigation.NavGraphBuilder, @IdRes int id, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+    method public static inline androidx.navigation.NavGraph navigation(androidx.navigation.NavigatorProvider, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+    method public static inline void navigation(androidx.navigation.NavGraphBuilder, @IdRes int id, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
   }
 
   public final class NavGraphKt {
     ctor public NavGraphKt();
     method public static operator boolean contains(androidx.navigation.NavGraph, @IdRes int id);
-    method public static operator androidx.navigation.NavDestination get(androidx.navigation.NavGraph, @IdRes int id);
-    method public static operator void minusAssign(androidx.navigation.NavGraph, androidx.navigation.NavDestination node);
-    method public static operator void plusAssign(androidx.navigation.NavGraph, androidx.navigation.NavDestination node);
-    method public static operator void plusAssign(androidx.navigation.NavGraph, androidx.navigation.NavGraph other);
+    method public static inline operator androidx.navigation.NavDestination get(androidx.navigation.NavGraph, @IdRes int id);
+    method public static inline operator void minusAssign(androidx.navigation.NavGraph, androidx.navigation.NavDestination node);
+    method public static inline operator void plusAssign(androidx.navigation.NavGraph, androidx.navigation.NavDestination node);
+    method public static inline operator void plusAssign(androidx.navigation.NavGraph, androidx.navigation.NavGraph other);
   }
 
   @androidx.navigation.NavOptionsDsl public final class NavOptionsBuilder {
@@ -112,10 +112,10 @@
 
   public final class NavigatorProviderKt {
     ctor public NavigatorProviderKt();
-    method public static operator <T extends androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>> T get(androidx.navigation.NavigatorProvider, String name);
-    method public static operator <T extends androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>> T get(androidx.navigation.NavigatorProvider, kotlin.reflect.KClass<T> clazz);
-    method public static operator void plusAssign(androidx.navigation.NavigatorProvider, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
-    method public static operator androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>? set(androidx.navigation.NavigatorProvider, String name, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
+    method public static inline operator <T extends androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>> T get(androidx.navigation.NavigatorProvider, String name);
+    method public static inline operator <T extends androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>> T get(androidx.navigation.NavigatorProvider, kotlin.reflect.KClass<T> clazz);
+    method public static inline operator void plusAssign(androidx.navigation.NavigatorProvider, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
+    method public static inline operator androidx.navigation.Navigator<? extends androidx.navigation.NavDestination>? set(androidx.navigation.NavigatorProvider, String name, androidx.navigation.Navigator<? extends androidx.navigation.NavDestination> navigator);
   }
 
   @androidx.navigation.NavOptionsDsl public final class PopUpToBuilder {
diff --git a/navigation/fragment/api/1.0.0-alpha08.txt b/navigation/fragment/api/1.0.0-alpha08.txt
index c73995b..8759a64 100644
--- a/navigation/fragment/api/1.0.0-alpha08.txt
+++ b/navigation/fragment/api/1.0.0-alpha08.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.fragment {
 
   @androidx.navigation.Navigator.Name("fragment") public class FragmentNavigator extends androidx.navigation.Navigator<androidx.navigation.fragment.FragmentNavigator.Destination> {
diff --git a/navigation/fragment/api/1.0.0-alpha09.txt b/navigation/fragment/api/1.0.0-alpha09.txt
index c73995b..8759a64 100644
--- a/navigation/fragment/api/1.0.0-alpha09.txt
+++ b/navigation/fragment/api/1.0.0-alpha09.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.fragment {
 
   @androidx.navigation.Navigator.Name("fragment") public class FragmentNavigator extends androidx.navigation.Navigator<androidx.navigation.fragment.FragmentNavigator.Destination> {
diff --git a/navigation/fragment/api/1.0.0-alpha10.txt b/navigation/fragment/api/1.0.0-alpha10.txt
index c73995b..8759a64 100644
--- a/navigation/fragment/api/1.0.0-alpha10.txt
+++ b/navigation/fragment/api/1.0.0-alpha10.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.fragment {
 
   @androidx.navigation.Navigator.Name("fragment") public class FragmentNavigator extends androidx.navigation.Navigator<androidx.navigation.fragment.FragmentNavigator.Destination> {
diff --git a/navigation/fragment/api/1.0.0-alpha11.txt b/navigation/fragment/api/1.0.0-alpha11.txt
index c73995b..8759a64 100644
--- a/navigation/fragment/api/1.0.0-alpha11.txt
+++ b/navigation/fragment/api/1.0.0-alpha11.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.fragment {
 
   @androidx.navigation.Navigator.Name("fragment") public class FragmentNavigator extends androidx.navigation.Navigator<androidx.navigation.fragment.FragmentNavigator.Destination> {
diff --git a/navigation/fragment/api/current.txt b/navigation/fragment/api/current.txt
index c73995b..8759a64 100644
--- a/navigation/fragment/api/current.txt
+++ b/navigation/fragment/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.fragment {
 
   @androidx.navigation.Navigator.Name("fragment") public class FragmentNavigator extends androidx.navigation.Navigator<androidx.navigation.fragment.FragmentNavigator.Destination> {
diff --git a/navigation/fragment/ktx/api/1.0.0-alpha08.txt b/navigation/fragment/ktx/api/1.0.0-alpha08.txt
index b126ace..07491e2 100644
--- a/navigation/fragment/ktx/api/1.0.0-alpha08.txt
+++ b/navigation/fragment/ktx/api/1.0.0-alpha08.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.fragment {
 
   public final class FragmentKt {
diff --git a/navigation/fragment/ktx/api/1.0.0-alpha09.txt b/navigation/fragment/ktx/api/1.0.0-alpha09.txt
index b126ace..07491e2 100644
--- a/navigation/fragment/ktx/api/1.0.0-alpha09.txt
+++ b/navigation/fragment/ktx/api/1.0.0-alpha09.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.fragment {
 
   public final class FragmentKt {
diff --git a/navigation/fragment/ktx/api/1.0.0-alpha10.txt b/navigation/fragment/ktx/api/1.0.0-alpha10.txt
index 9d0cbae..e0961d2 100644
--- a/navigation/fragment/ktx/api/1.0.0-alpha10.txt
+++ b/navigation/fragment/ktx/api/1.0.0-alpha10.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.fragment {
 
   public final class FragmentKt {
diff --git a/navigation/fragment/ktx/api/1.0.0-alpha11.txt b/navigation/fragment/ktx/api/1.0.0-alpha11.txt
index 9d0cbae..0e75320 100644
--- a/navigation/fragment/ktx/api/1.0.0-alpha11.txt
+++ b/navigation/fragment/ktx/api/1.0.0-alpha11.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.fragment {
 
   public final class FragmentKt {
@@ -8,6 +8,7 @@
 
   public final class FragmentNavArgsLazyKt {
     ctor public FragmentNavArgsLazyKt();
+    method @MainThread public static inline <reified Args extends androidx.navigation.NavArgs> androidx.navigation.NavArgsLazy<Args>! navArgs(android.support.v4.app.Fragment);
   }
 
   public final class FragmentNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.fragment.FragmentNavigator.Destination> {
@@ -17,6 +18,8 @@
 
   public final class FragmentNavigatorDestinationBuilderKt {
     ctor public FragmentNavigatorDestinationBuilderKt();
+    method public static inline <reified F extends android.support.v4.app.Fragment> void fragment(androidx.navigation.NavGraphBuilder, @IdRes int id);
+    method public static inline <reified F extends android.support.v4.app.Fragment> void fragment(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.fragment.FragmentNavigatorDestinationBuilder,kotlin.Unit>! builder);
   }
 
   public final class FragmentNavigatorExtrasKt {
diff --git a/navigation/fragment/ktx/api/current.txt b/navigation/fragment/ktx/api/current.txt
index 9d0cbae..0e75320 100644
--- a/navigation/fragment/ktx/api/current.txt
+++ b/navigation/fragment/ktx/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.fragment {
 
   public final class FragmentKt {
@@ -8,6 +8,7 @@
 
   public final class FragmentNavArgsLazyKt {
     ctor public FragmentNavArgsLazyKt();
+    method @MainThread public static inline <reified Args extends androidx.navigation.NavArgs> androidx.navigation.NavArgsLazy<Args>! navArgs(android.support.v4.app.Fragment);
   }
 
   public final class FragmentNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.fragment.FragmentNavigator.Destination> {
@@ -17,6 +18,8 @@
 
   public final class FragmentNavigatorDestinationBuilderKt {
     ctor public FragmentNavigatorDestinationBuilderKt();
+    method public static inline <reified F extends android.support.v4.app.Fragment> void fragment(androidx.navigation.NavGraphBuilder, @IdRes int id);
+    method public static inline <reified F extends android.support.v4.app.Fragment> void fragment(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.fragment.FragmentNavigatorDestinationBuilder,kotlin.Unit>! builder);
   }
 
   public final class FragmentNavigatorExtrasKt {
diff --git a/navigation/runtime/api/1.0.0-alpha08.txt b/navigation/runtime/api/1.0.0-alpha08.txt
index fc3d943..1a22540 100644
--- a/navigation/runtime/api/1.0.0-alpha08.txt
+++ b/navigation/runtime/api/1.0.0-alpha08.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   @androidx.navigation.Navigator.Name("activity") public class ActivityNavigator extends androidx.navigation.Navigator<androidx.navigation.ActivityNavigator.Destination> {
diff --git a/navigation/runtime/api/1.0.0-alpha09.txt b/navigation/runtime/api/1.0.0-alpha09.txt
index fc3d943..1a22540 100644
--- a/navigation/runtime/api/1.0.0-alpha09.txt
+++ b/navigation/runtime/api/1.0.0-alpha09.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   @androidx.navigation.Navigator.Name("activity") public class ActivityNavigator extends androidx.navigation.Navigator<androidx.navigation.ActivityNavigator.Destination> {
diff --git a/navigation/runtime/api/1.0.0-alpha10.txt b/navigation/runtime/api/1.0.0-alpha10.txt
index 84c6a22..0073e0d 100644
--- a/navigation/runtime/api/1.0.0-alpha10.txt
+++ b/navigation/runtime/api/1.0.0-alpha10.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   @androidx.navigation.Navigator.Name("activity") public class ActivityNavigator extends androidx.navigation.Navigator<androidx.navigation.ActivityNavigator.Destination> {
diff --git a/navigation/runtime/api/1.0.0-alpha11.txt b/navigation/runtime/api/1.0.0-alpha11.txt
index 84c6a22..0073e0d 100644
--- a/navigation/runtime/api/1.0.0-alpha11.txt
+++ b/navigation/runtime/api/1.0.0-alpha11.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   @androidx.navigation.Navigator.Name("activity") public class ActivityNavigator extends androidx.navigation.Navigator<androidx.navigation.ActivityNavigator.Destination> {
diff --git a/navigation/runtime/api/current.txt b/navigation/runtime/api/current.txt
index 84c6a22..0073e0d 100644
--- a/navigation/runtime/api/current.txt
+++ b/navigation/runtime/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   @androidx.navigation.Navigator.Name("activity") public class ActivityNavigator extends androidx.navigation.Navigator<androidx.navigation.ActivityNavigator.Destination> {
diff --git a/navigation/runtime/ktx/api/1.0.0-alpha08.txt b/navigation/runtime/ktx/api/1.0.0-alpha08.txt
index 1601006..2c46cef 100644
--- a/navigation/runtime/ktx/api/1.0.0-alpha08.txt
+++ b/navigation/runtime/ktx/api/1.0.0-alpha08.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   public final class ActivityKt {
diff --git a/navigation/runtime/ktx/api/1.0.0-alpha09.txt b/navigation/runtime/ktx/api/1.0.0-alpha09.txt
index 1601006..2c46cef 100644
--- a/navigation/runtime/ktx/api/1.0.0-alpha09.txt
+++ b/navigation/runtime/ktx/api/1.0.0-alpha09.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   public final class ActivityKt {
diff --git a/navigation/runtime/ktx/api/1.0.0-alpha10.txt b/navigation/runtime/ktx/api/1.0.0-alpha10.txt
index 6f68765..d099848 100644
--- a/navigation/runtime/ktx/api/1.0.0-alpha10.txt
+++ b/navigation/runtime/ktx/api/1.0.0-alpha10.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   public final class ActivityKt {
diff --git a/navigation/runtime/ktx/api/1.0.0-alpha11.txt b/navigation/runtime/ktx/api/1.0.0-alpha11.txt
index 6f68765..d1e3b0e 100644
--- a/navigation/runtime/ktx/api/1.0.0-alpha11.txt
+++ b/navigation/runtime/ktx/api/1.0.0-alpha11.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   public final class ActivityKt {
@@ -8,6 +8,7 @@
 
   public final class ActivityNavArgsLazyKt {
     ctor public ActivityNavArgsLazyKt();
+    method @MainThread public static inline <reified Args extends androidx.navigation.NavArgs> androidx.navigation.NavArgsLazy<Args>! navArgs(android.app.Activity);
   }
 
   public final class ActivityNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.ActivityNavigator.Destination> {
@@ -29,7 +30,7 @@
 
   public final class ActivityNavigatorDestinationBuilderKt {
     ctor public ActivityNavigatorDestinationBuilderKt();
-    method public static void activity(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.ActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
+    method public static inline void activity(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.ActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
   }
 
   public final class ActivityNavigatorExtrasKt {
@@ -39,12 +40,12 @@
 
   public final class NavControllerKt {
     ctor public NavControllerKt();
-    method public static androidx.navigation.NavGraph createGraph(androidx.navigation.NavController, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavController, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
   }
 
   public final class NavHostKt {
     ctor public NavHostKt();
-    method public static androidx.navigation.NavGraph createGraph(androidx.navigation.NavHost, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavHost, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
   }
 
   public final class ViewKt {
diff --git a/navigation/runtime/ktx/api/current.txt b/navigation/runtime/ktx/api/current.txt
index 6f68765..d1e3b0e 100644
--- a/navigation/runtime/ktx/api/current.txt
+++ b/navigation/runtime/ktx/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation {
 
   public final class ActivityKt {
@@ -8,6 +8,7 @@
 
   public final class ActivityNavArgsLazyKt {
     ctor public ActivityNavArgsLazyKt();
+    method @MainThread public static inline <reified Args extends androidx.navigation.NavArgs> androidx.navigation.NavArgsLazy<Args>! navArgs(android.app.Activity);
   }
 
   public final class ActivityNavigatorDestinationBuilder extends androidx.navigation.NavDestinationBuilder<androidx.navigation.ActivityNavigator.Destination> {
@@ -29,7 +30,7 @@
 
   public final class ActivityNavigatorDestinationBuilderKt {
     ctor public ActivityNavigatorDestinationBuilderKt();
-    method public static void activity(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.ActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
+    method public static inline void activity(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.ActivityNavigatorDestinationBuilder,kotlin.Unit> builder);
   }
 
   public final class ActivityNavigatorExtrasKt {
@@ -39,12 +40,12 @@
 
   public final class NavControllerKt {
     ctor public NavControllerKt();
-    method public static androidx.navigation.NavGraph createGraph(androidx.navigation.NavController, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavController, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
   }
 
   public final class NavHostKt {
     ctor public NavHostKt();
-    method public static androidx.navigation.NavGraph createGraph(androidx.navigation.NavHost, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
+    method public static inline androidx.navigation.NavGraph createGraph(androidx.navigation.NavHost, @IdRes int id = 0, @IdRes int startDestination, kotlin.jvm.functions.Function1<? super androidx.navigation.NavGraphBuilder,kotlin.Unit> builder);
   }
 
   public final class ViewKt {
diff --git a/navigation/testing/api/1.0.0-alpha08.txt b/navigation/testing/api/1.0.0-alpha08.txt
index 7ad74f7..424f6bac6 100644
--- a/navigation/testing/api/1.0.0-alpha08.txt
+++ b/navigation/testing/api/1.0.0-alpha08.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.testing {
 
   @androidx.navigation.Navigator.Name("test") public class TestNavigator extends androidx.navigation.Navigator<androidx.navigation.testing.TestNavigator.Destination> {
@@ -21,8 +21,8 @@
 
   public final class TestNavigatorDestinationBuilderKt {
     ctor public TestNavigatorDestinationBuilderKt();
-    method public static void test(androidx.navigation.NavGraphBuilder, @IdRes int id);
-    method public static void test(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.testing.TestNavigatorDestinationBuilder,kotlin.Unit> builder);
+    method public static inline void test(androidx.navigation.NavGraphBuilder, @IdRes int id);
+    method public static inline void test(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.testing.TestNavigatorDestinationBuilder,kotlin.Unit> builder);
   }
 
   public final class TestNavigatorProvider extends androidx.navigation.NavigatorProvider {
diff --git a/navigation/testing/api/current.txt b/navigation/testing/api/current.txt
index 7ad74f7..424f6bac6 100644
--- a/navigation/testing/api/current.txt
+++ b/navigation/testing/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.testing {
 
   @androidx.navigation.Navigator.Name("test") public class TestNavigator extends androidx.navigation.Navigator<androidx.navigation.testing.TestNavigator.Destination> {
@@ -21,8 +21,8 @@
 
   public final class TestNavigatorDestinationBuilderKt {
     ctor public TestNavigatorDestinationBuilderKt();
-    method public static void test(androidx.navigation.NavGraphBuilder, @IdRes int id);
-    method public static void test(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.testing.TestNavigatorDestinationBuilder,kotlin.Unit> builder);
+    method public static inline void test(androidx.navigation.NavGraphBuilder, @IdRes int id);
+    method public static inline void test(androidx.navigation.NavGraphBuilder, @IdRes int id, kotlin.jvm.functions.Function1<? super androidx.navigation.testing.TestNavigatorDestinationBuilder,kotlin.Unit> builder);
   }
 
   public final class TestNavigatorProvider extends androidx.navigation.NavigatorProvider {
diff --git a/navigation/ui/api/1.0.0-alpha08.txt b/navigation/ui/api/1.0.0-alpha08.txt
index b9d5f97..99acd8ae 100644
--- a/navigation/ui/api/1.0.0-alpha08.txt
+++ b/navigation/ui/api/1.0.0-alpha08.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.ui {
 
   public final class AppBarConfiguration {
diff --git a/navigation/ui/api/1.0.0-alpha09.txt b/navigation/ui/api/1.0.0-alpha09.txt
index 8a6be3d..af2f1c1 100644
--- a/navigation/ui/api/1.0.0-alpha09.txt
+++ b/navigation/ui/api/1.0.0-alpha09.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.ui {
 
   public final class AppBarConfiguration {
diff --git a/navigation/ui/api/1.0.0-alpha10.txt b/navigation/ui/api/1.0.0-alpha10.txt
index 8a6be3d..af2f1c1 100644
--- a/navigation/ui/api/1.0.0-alpha10.txt
+++ b/navigation/ui/api/1.0.0-alpha10.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.ui {
 
   public final class AppBarConfiguration {
diff --git a/navigation/ui/api/1.0.0-alpha11.txt b/navigation/ui/api/1.0.0-alpha11.txt
index 8a6be3d..af2f1c1 100644
--- a/navigation/ui/api/1.0.0-alpha11.txt
+++ b/navigation/ui/api/1.0.0-alpha11.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.ui {
 
   public final class AppBarConfiguration {
diff --git a/navigation/ui/api/current.txt b/navigation/ui/api/current.txt
index 8a6be3d..af2f1c1 100644
--- a/navigation/ui/api/current.txt
+++ b/navigation/ui/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.ui {
 
   public final class AppBarConfiguration {
diff --git a/navigation/ui/ktx/api/1.0.0-alpha07.txt b/navigation/ui/ktx/api/1.0.0-alpha07.txt
index cde4c49..6e989e6 100644
--- a/navigation/ui/ktx/api/1.0.0-alpha07.txt
+++ b/navigation/ui/ktx/api/1.0.0-alpha07.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.ui {
 
   public final class ActivityKt {
diff --git a/navigation/ui/ktx/api/1.0.0-alpha08.txt b/navigation/ui/ktx/api/1.0.0-alpha08.txt
index e2aa356..3d0c8fc 100644
--- a/navigation/ui/ktx/api/1.0.0-alpha08.txt
+++ b/navigation/ui/ktx/api/1.0.0-alpha08.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.ui {
 
   public final class ActivityKt {
diff --git a/navigation/ui/ktx/api/1.0.0-alpha09.txt b/navigation/ui/ktx/api/1.0.0-alpha09.txt
index 768c32b..393aadd 100644
--- a/navigation/ui/ktx/api/1.0.0-alpha09.txt
+++ b/navigation/ui/ktx/api/1.0.0-alpha09.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.ui {
 
   public final class ActivityKt {
diff --git a/navigation/ui/ktx/api/1.0.0-alpha10.txt b/navigation/ui/ktx/api/1.0.0-alpha10.txt
index 768c32b..393aadd 100644
--- a/navigation/ui/ktx/api/1.0.0-alpha10.txt
+++ b/navigation/ui/ktx/api/1.0.0-alpha10.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.ui {
 
   public final class ActivityKt {
diff --git a/navigation/ui/ktx/api/1.0.0-alpha11.txt b/navigation/ui/ktx/api/1.0.0-alpha11.txt
index 768c32b..578c40c 100644
--- a/navigation/ui/ktx/api/1.0.0-alpha11.txt
+++ b/navigation/ui/ktx/api/1.0.0-alpha11.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.ui {
 
   public final class ActivityKt {
@@ -9,9 +9,9 @@
 
   public final class AppBarConfigurationKt {
     ctor public AppBarConfigurationKt();
-    method public static androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(androidx.navigation.NavGraph navGraph, android.support.v4.widget.DrawerLayout? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
-    method public static androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(android.view.Menu topLevelMenu, android.support.v4.widget.DrawerLayout? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
-    method public static androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(java.util.Set<java.lang.Integer> topLevelDestinationIds, android.support.v4.widget.DrawerLayout? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
+    method public static inline androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(androidx.navigation.NavGraph navGraph, android.support.v4.widget.DrawerLayout? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
+    method public static inline androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(android.view.Menu topLevelMenu, android.support.v4.widget.DrawerLayout? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
+    method public static inline androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(java.util.Set<java.lang.Integer> topLevelDestinationIds, android.support.v4.widget.DrawerLayout? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
   }
 
   public final class BottomNavigationViewKt {
diff --git a/navigation/ui/ktx/api/current.txt b/navigation/ui/ktx/api/current.txt
index 768c32b..578c40c 100644
--- a/navigation/ui/ktx/api/current.txt
+++ b/navigation/ui/ktx/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.navigation.ui {
 
   public final class ActivityKt {
@@ -9,9 +9,9 @@
 
   public final class AppBarConfigurationKt {
     ctor public AppBarConfigurationKt();
-    method public static androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(androidx.navigation.NavGraph navGraph, android.support.v4.widget.DrawerLayout? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
-    method public static androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(android.view.Menu topLevelMenu, android.support.v4.widget.DrawerLayout? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
-    method public static androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(java.util.Set<java.lang.Integer> topLevelDestinationIds, android.support.v4.widget.DrawerLayout? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
+    method public static inline androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(androidx.navigation.NavGraph navGraph, android.support.v4.widget.DrawerLayout? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
+    method public static inline androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(android.view.Menu topLevelMenu, android.support.v4.widget.DrawerLayout? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
+    method public static inline androidx.navigation.ui.AppBarConfiguration AppBarConfiguration(java.util.Set<java.lang.Integer> topLevelDestinationIds, android.support.v4.widget.DrawerLayout? drawerLayout = null, kotlin.jvm.functions.Function0<java.lang.Boolean> fallbackOnNavigateUpListener = { false });
   }
 
   public final class BottomNavigationViewKt {
diff --git a/paging/common/api/2.2.0-alpha01.txt b/paging/common/api/2.2.0-alpha01.txt
index e5a1266..cf13c47 100644
--- a/paging/common/api/2.2.0-alpha01.txt
+++ b/paging/common/api/2.2.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.paging {
 
   public abstract class DataSource<Key, Value> {
@@ -153,7 +153,7 @@
     method public androidx.paging.PagedList.Config.Builder setPrefetchDistance(@IntRange(from=0) int);
   }
 
-  public static enum PagedList.LoadState {
+  public enum PagedList.LoadState {
     enum_constant public static final androidx.paging.PagedList.LoadState DONE;
     enum_constant public static final androidx.paging.PagedList.LoadState ERROR;
     enum_constant public static final androidx.paging.PagedList.LoadState IDLE;
@@ -165,7 +165,7 @@
     method public void onLoadStateChanged(androidx.paging.PagedList.LoadType, androidx.paging.PagedList.LoadState, Throwable?);
   }
 
-  public static enum PagedList.LoadType {
+  public enum PagedList.LoadType {
     enum_constant public static final androidx.paging.PagedList.LoadType END;
     enum_constant public static final androidx.paging.PagedList.LoadType REFRESH;
     enum_constant public static final androidx.paging.PagedList.LoadType START;
diff --git a/paging/common/api/current.txt b/paging/common/api/current.txt
index e5a1266..cf13c47 100644
--- a/paging/common/api/current.txt
+++ b/paging/common/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.paging {
 
   public abstract class DataSource<Key, Value> {
@@ -153,7 +153,7 @@
     method public androidx.paging.PagedList.Config.Builder setPrefetchDistance(@IntRange(from=0) int);
   }
 
-  public static enum PagedList.LoadState {
+  public enum PagedList.LoadState {
     enum_constant public static final androidx.paging.PagedList.LoadState DONE;
     enum_constant public static final androidx.paging.PagedList.LoadState ERROR;
     enum_constant public static final androidx.paging.PagedList.LoadState IDLE;
@@ -165,7 +165,7 @@
     method public void onLoadStateChanged(androidx.paging.PagedList.LoadType, androidx.paging.PagedList.LoadState, Throwable?);
   }
 
-  public static enum PagedList.LoadType {
+  public enum PagedList.LoadType {
     enum_constant public static final androidx.paging.PagedList.LoadType END;
     enum_constant public static final androidx.paging.PagedList.LoadType REFRESH;
     enum_constant public static final androidx.paging.PagedList.LoadType START;
diff --git a/paging/common/ktx/api/2.2.0-alpha01.txt b/paging/common/ktx/api/2.2.0-alpha01.txt
index 0f070c2..6d9cc829 100644
--- a/paging/common/ktx/api/2.2.0-alpha01.txt
+++ b/paging/common/ktx/api/2.2.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.paging {
 
   public final class PagedListConfigKt {
diff --git a/paging/common/ktx/api/current.txt b/paging/common/ktx/api/current.txt
index 0f070c2..6d9cc829 100644
--- a/paging/common/ktx/api/current.txt
+++ b/paging/common/ktx/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.paging {
 
   public final class PagedListConfigKt {
diff --git a/paging/runtime/api/2.2.0-alpha01.txt b/paging/runtime/api/2.2.0-alpha01.txt
index 889c9bf..f6bd0de 100644
--- a/paging/runtime/api/2.2.0-alpha01.txt
+++ b/paging/runtime/api/2.2.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.paging {
 
   public class AsyncPagedListDiffer<T> {
diff --git a/paging/runtime/api/current.txt b/paging/runtime/api/current.txt
index 889c9bf..f6bd0de 100644
--- a/paging/runtime/api/current.txt
+++ b/paging/runtime/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.paging {
 
   public class AsyncPagedListDiffer<T> {
diff --git a/paging/runtime/ktx/api/2.2.0-alpha01.txt b/paging/runtime/ktx/api/2.2.0-alpha01.txt
index b7750be..9d5a1df 100644
--- a/paging/runtime/ktx/api/2.2.0-alpha01.txt
+++ b/paging/runtime/ktx/api/2.2.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.paging {
 
   public final class LivePagedListKt {
diff --git a/paging/runtime/ktx/api/current.txt b/paging/runtime/ktx/api/current.txt
index b7750be..9d5a1df 100644
--- a/paging/runtime/ktx/api/current.txt
+++ b/paging/runtime/ktx/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.paging {
 
   public final class LivePagedListKt {
diff --git a/paging/rxjava2/api/2.2.0-alpha01.txt b/paging/rxjava2/api/2.2.0-alpha01.txt
index 067f422..334f21d 100644
--- a/paging/rxjava2/api/2.2.0-alpha01.txt
+++ b/paging/rxjava2/api/2.2.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.paging {
 
   public final class RxPagedListBuilder<Key, Value> {
diff --git a/paging/rxjava2/api/current.txt b/paging/rxjava2/api/current.txt
index 067f422..334f21d 100644
--- a/paging/rxjava2/api/current.txt
+++ b/paging/rxjava2/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.paging {
 
   public final class RxPagedListBuilder<Key, Value> {
diff --git a/paging/rxjava2/ktx/api/2.2.0-alpha01.txt b/paging/rxjava2/ktx/api/2.2.0-alpha01.txt
index 6b573b4..5319bb1 100644
--- a/paging/rxjava2/ktx/api/2.2.0-alpha01.txt
+++ b/paging/rxjava2/ktx/api/2.2.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.paging {
 
   public final class RxPagedListKt {
diff --git a/paging/rxjava2/ktx/api/current.txt b/paging/rxjava2/ktx/api/current.txt
index 6b573b4..5319bb1 100644
--- a/paging/rxjava2/ktx/api/current.txt
+++ b/paging/rxjava2/ktx/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.paging {
 
   public final class RxPagedListKt {
diff --git a/palette/api/1.1.0-alpha01.txt b/palette/api/1.1.0-alpha01.txt
index 33fbc68..cbe84e9 100644
--- a/palette/api/1.1.0-alpha01.txt
+++ b/palette/api/1.1.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.palette.graphics {
 
   public final class Palette {
diff --git a/palette/api/current.txt b/palette/api/current.txt
index 33fbc68..cbe84e9 100644
--- a/palette/api/current.txt
+++ b/palette/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.palette.graphics {
 
   public final class Palette {
diff --git a/palette/ktx/api/1.1.0-alpha01.txt b/palette/ktx/api/1.1.0-alpha01.txt
index 6c2d5b9..4976ef2 100644
--- a/palette/ktx/api/1.1.0-alpha01.txt
+++ b/palette/ktx/api/1.1.0-alpha01.txt
@@ -1,9 +1,9 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.palette.graphics {
 
   public final class PaletteKt {
     ctor public PaletteKt();
-    method public static operator androidx.palette.graphics.Palette.Swatch? get(androidx.palette.graphics.Palette, androidx.palette.graphics.Target target);
+    method public static inline operator androidx.palette.graphics.Palette.Swatch? get(androidx.palette.graphics.Palette, androidx.palette.graphics.Target target);
   }
 
 }
diff --git a/palette/ktx/api/current.txt b/palette/ktx/api/current.txt
index 6c2d5b9..4976ef2 100644
--- a/palette/ktx/api/current.txt
+++ b/palette/ktx/api/current.txt
@@ -1,9 +1,9 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.palette.graphics {
 
   public final class PaletteKt {
     ctor public PaletteKt();
-    method public static operator androidx.palette.graphics.Palette.Swatch? get(androidx.palette.graphics.Palette, androidx.palette.graphics.Target target);
+    method public static inline operator androidx.palette.graphics.Palette.Swatch? get(androidx.palette.graphics.Palette, androidx.palette.graphics.Target target);
   }
 
 }
diff --git a/percent/api/1.0.0.txt b/percent/api/1.0.0.txt
index 0a80f73..13744ae 100644
--- a/percent/api/1.0.0.txt
+++ b/percent/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.percentlayout.widget {
 
   @Deprecated public class PercentFrameLayout extends android.widget.FrameLayout {
@@ -7,8 +7,6 @@
     ctor @Deprecated public PercentFrameLayout(android.content.Context!, android.util.AttributeSet!, int);
     method @Deprecated protected androidx.percentlayout.widget.PercentFrameLayout.LayoutParams! generateDefaultLayoutParams();
     method @Deprecated public androidx.percentlayout.widget.PercentFrameLayout.LayoutParams! generateLayoutParams(android.util.AttributeSet!);
-    method @Deprecated protected void onLayout(boolean, int, int, int, int);
-    method @Deprecated protected void onMeasure(int, int);
   }
 
   @Deprecated public static class PercentFrameLayout.LayoutParams extends android.widget.FrameLayout.LayoutParams implements androidx.percentlayout.widget.PercentLayoutHelper.PercentLayoutParams {
@@ -20,7 +18,6 @@
     ctor @Deprecated public PercentFrameLayout.LayoutParams(android.widget.FrameLayout.LayoutParams!);
     ctor @Deprecated @RequiresApi(19) public PercentFrameLayout.LayoutParams(androidx.percentlayout.widget.PercentFrameLayout.LayoutParams!);
     method @Deprecated public androidx.percentlayout.widget.PercentLayoutHelper.PercentLayoutInfo! getPercentLayoutInfo();
-    method @Deprecated protected void setBaseAttributes(android.content.res.TypedArray!, int, int);
   }
 
   @Deprecated public class PercentLayoutHelper {
@@ -39,7 +36,6 @@
     method @Deprecated public void fillMarginLayoutParams(android.view.View!, android.view.ViewGroup.MarginLayoutParams!, int, int);
     method @Deprecated public void restoreLayoutParams(android.view.ViewGroup.LayoutParams!);
     method @Deprecated public void restoreMarginLayoutParams(android.view.ViewGroup.MarginLayoutParams!);
-    method @Deprecated public String toString();
     field @Deprecated public float aspectRatio;
     field @Deprecated public float bottomMarginPercent;
     field @Deprecated public float endMarginPercent;
@@ -61,8 +57,6 @@
     ctor @Deprecated public PercentRelativeLayout(android.content.Context!, android.util.AttributeSet!, int);
     method @Deprecated protected androidx.percentlayout.widget.PercentRelativeLayout.LayoutParams! generateDefaultLayoutParams();
     method @Deprecated public androidx.percentlayout.widget.PercentRelativeLayout.LayoutParams! generateLayoutParams(android.util.AttributeSet!);
-    method @Deprecated protected void onLayout(boolean, int, int, int, int);
-    method @Deprecated protected void onMeasure(int, int);
   }
 
   @Deprecated public static class PercentRelativeLayout.LayoutParams extends android.widget.RelativeLayout.LayoutParams implements androidx.percentlayout.widget.PercentLayoutHelper.PercentLayoutParams {
@@ -71,7 +65,6 @@
     ctor @Deprecated public PercentRelativeLayout.LayoutParams(android.view.ViewGroup.LayoutParams!);
     ctor @Deprecated public PercentRelativeLayout.LayoutParams(android.view.ViewGroup.MarginLayoutParams!);
     method @Deprecated public androidx.percentlayout.widget.PercentLayoutHelper.PercentLayoutInfo! getPercentLayoutInfo();
-    method @Deprecated protected void setBaseAttributes(android.content.res.TypedArray!, int, int);
   }
 
 }
diff --git a/percent/api/current.txt b/percent/api/current.txt
index 0a80f73..13744ae 100644
--- a/percent/api/current.txt
+++ b/percent/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.percentlayout.widget {
 
   @Deprecated public class PercentFrameLayout extends android.widget.FrameLayout {
@@ -7,8 +7,6 @@
     ctor @Deprecated public PercentFrameLayout(android.content.Context!, android.util.AttributeSet!, int);
     method @Deprecated protected androidx.percentlayout.widget.PercentFrameLayout.LayoutParams! generateDefaultLayoutParams();
     method @Deprecated public androidx.percentlayout.widget.PercentFrameLayout.LayoutParams! generateLayoutParams(android.util.AttributeSet!);
-    method @Deprecated protected void onLayout(boolean, int, int, int, int);
-    method @Deprecated protected void onMeasure(int, int);
   }
 
   @Deprecated public static class PercentFrameLayout.LayoutParams extends android.widget.FrameLayout.LayoutParams implements androidx.percentlayout.widget.PercentLayoutHelper.PercentLayoutParams {
@@ -20,7 +18,6 @@
     ctor @Deprecated public PercentFrameLayout.LayoutParams(android.widget.FrameLayout.LayoutParams!);
     ctor @Deprecated @RequiresApi(19) public PercentFrameLayout.LayoutParams(androidx.percentlayout.widget.PercentFrameLayout.LayoutParams!);
     method @Deprecated public androidx.percentlayout.widget.PercentLayoutHelper.PercentLayoutInfo! getPercentLayoutInfo();
-    method @Deprecated protected void setBaseAttributes(android.content.res.TypedArray!, int, int);
   }
 
   @Deprecated public class PercentLayoutHelper {
@@ -39,7 +36,6 @@
     method @Deprecated public void fillMarginLayoutParams(android.view.View!, android.view.ViewGroup.MarginLayoutParams!, int, int);
     method @Deprecated public void restoreLayoutParams(android.view.ViewGroup.LayoutParams!);
     method @Deprecated public void restoreMarginLayoutParams(android.view.ViewGroup.MarginLayoutParams!);
-    method @Deprecated public String toString();
     field @Deprecated public float aspectRatio;
     field @Deprecated public float bottomMarginPercent;
     field @Deprecated public float endMarginPercent;
@@ -61,8 +57,6 @@
     ctor @Deprecated public PercentRelativeLayout(android.content.Context!, android.util.AttributeSet!, int);
     method @Deprecated protected androidx.percentlayout.widget.PercentRelativeLayout.LayoutParams! generateDefaultLayoutParams();
     method @Deprecated public androidx.percentlayout.widget.PercentRelativeLayout.LayoutParams! generateLayoutParams(android.util.AttributeSet!);
-    method @Deprecated protected void onLayout(boolean, int, int, int, int);
-    method @Deprecated protected void onMeasure(int, int);
   }
 
   @Deprecated public static class PercentRelativeLayout.LayoutParams extends android.widget.RelativeLayout.LayoutParams implements androidx.percentlayout.widget.PercentLayoutHelper.PercentLayoutParams {
@@ -71,7 +65,6 @@
     ctor @Deprecated public PercentRelativeLayout.LayoutParams(android.view.ViewGroup.LayoutParams!);
     ctor @Deprecated public PercentRelativeLayout.LayoutParams(android.view.ViewGroup.MarginLayoutParams!);
     method @Deprecated public androidx.percentlayout.widget.PercentLayoutHelper.PercentLayoutInfo! getPercentLayoutInfo();
-    method @Deprecated protected void setBaseAttributes(android.content.res.TypedArray!, int, int);
   }
 
 }
diff --git a/persistence/db-framework/api/2.0.0.txt b/persistence/db-framework/api/2.0.0.txt
index 19c73cc..9c05b84 100644
--- a/persistence/db-framework/api/2.0.0.txt
+++ b/persistence/db-framework/api/2.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.sqlite.db.framework {
 
   public final class FrameworkSQLiteOpenHelperFactory implements androidx.sqlite.db.SupportSQLiteOpenHelper.Factory {
diff --git a/persistence/db-framework/api/current.txt b/persistence/db-framework/api/current.txt
index 19c73cc..9c05b84 100644
--- a/persistence/db-framework/api/current.txt
+++ b/persistence/db-framework/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.sqlite.db.framework {
 
   public final class FrameworkSQLiteOpenHelperFactory implements androidx.sqlite.db.SupportSQLiteOpenHelper.Factory {
diff --git a/persistence/db/api/2.0.0.txt b/persistence/db/api/2.0.0.txt
index 3a28736..a7ae53f 100644
--- a/persistence/db/api/2.0.0.txt
+++ b/persistence/db/api/2.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.sqlite.db {
 
   public final class SimpleSQLiteQuery implements androidx.sqlite.db.SupportSQLiteQuery {
diff --git a/persistence/db/api/current.txt b/persistence/db/api/current.txt
index 3a28736..a7ae53f 100644
--- a/persistence/db/api/current.txt
+++ b/persistence/db/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.sqlite.db {
 
   public final class SimpleSQLiteQuery implements androidx.sqlite.db.SupportSQLiteQuery {
diff --git a/persistence/db/ktx/api/2.0.0.txt b/persistence/db/ktx/api/2.0.0.txt
index 7b43b5d..750b634 100644
--- a/persistence/db/ktx/api/2.0.0.txt
+++ b/persistence/db/ktx/api/2.0.0.txt
@@ -1,9 +1,9 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.sqlite.db {
 
   public final class SupportSQLiteDatabaseKt {
     ctor public SupportSQLiteDatabaseKt();
-    method public static <T> T! transaction(androidx.sqlite.db.SupportSQLiteDatabase, boolean exclusive = true, kotlin.jvm.functions.Function1<? super androidx.sqlite.db.SupportSQLiteDatabase,? extends T> body);
+    method public static inline <T> T! transaction(androidx.sqlite.db.SupportSQLiteDatabase, boolean exclusive = true, kotlin.jvm.functions.Function1<? super androidx.sqlite.db.SupportSQLiteDatabase,? extends T> body);
   }
 
 }
diff --git a/persistence/db/ktx/api/current.txt b/persistence/db/ktx/api/current.txt
index 7b43b5d..750b634 100644
--- a/persistence/db/ktx/api/current.txt
+++ b/persistence/db/ktx/api/current.txt
@@ -1,9 +1,9 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.sqlite.db {
 
   public final class SupportSQLiteDatabaseKt {
     ctor public SupportSQLiteDatabaseKt();
-    method public static <T> T! transaction(androidx.sqlite.db.SupportSQLiteDatabase, boolean exclusive = true, kotlin.jvm.functions.Function1<? super androidx.sqlite.db.SupportSQLiteDatabase,? extends T> body);
+    method public static inline <T> T! transaction(androidx.sqlite.db.SupportSQLiteDatabase, boolean exclusive = true, kotlin.jvm.functions.Function1<? super androidx.sqlite.db.SupportSQLiteDatabase,? extends T> body);
   }
 
 }
diff --git a/preference/api/1.1.0-alpha03.txt b/preference/api/1.1.0-alpha03.txt
index 5a60465..d3b0755 100644
--- a/preference/api/1.1.0-alpha03.txt
+++ b/preference/api/1.1.0-alpha03.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.preference {
 
   public class CheckBoxPreference extends androidx.preference.TwoStatePreference {
@@ -290,13 +290,9 @@
     method @Deprecated public androidx.preference.DialogPreference! getPreference();
     method @Deprecated protected void onBindDialogView(android.view.View!);
     method @Deprecated public void onClick(android.content.DialogInterface!, int);
-    method @Deprecated public void onCreate(android.os.Bundle!);
-    method @Deprecated public android.app.Dialog onCreateDialog(android.os.Bundle!);
     method @Deprecated protected android.view.View! onCreateDialogView(android.content.Context!);
     method @Deprecated public abstract void onDialogClosed(boolean);
-    method @Deprecated public void onDismiss(android.content.DialogInterface!);
     method @Deprecated protected void onPrepareDialogBuilder(android.app.AlertDialog.Builder!);
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle);
     field @Deprecated protected static final String ARG_KEY = "key";
   }
 
@@ -318,20 +314,13 @@
     method @Deprecated public final androidx.recyclerview.widget.RecyclerView! getListView();
     method @Deprecated public androidx.preference.PreferenceManager! getPreferenceManager();
     method @Deprecated public androidx.preference.PreferenceScreen! getPreferenceScreen();
-    method @Deprecated public void onCreate(android.os.Bundle!);
     method @Deprecated protected androidx.recyclerview.widget.RecyclerView.Adapter! onCreateAdapter(androidx.preference.PreferenceScreen!);
     method @Deprecated public androidx.recyclerview.widget.RecyclerView.LayoutManager! onCreateLayoutManager();
     method @Deprecated public abstract void onCreatePreferences(android.os.Bundle!, String!);
     method @Deprecated public androidx.recyclerview.widget.RecyclerView! onCreateRecyclerView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onDestroyView();
     method @Deprecated public void onDisplayPreferenceDialog(androidx.preference.Preference!);
     method @Deprecated public void onNavigateToScreen(androidx.preference.PreferenceScreen!);
     method @Deprecated public boolean onPreferenceTreeClick(androidx.preference.Preference!);
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle!);
-    method @Deprecated public void onStart();
-    method @Deprecated public void onStop();
-    method @Deprecated public void onViewCreated(android.view.View!, android.os.Bundle!);
     method @Deprecated public void scrollToPreference(String!);
     method @Deprecated public void scrollToPreference(androidx.preference.Preference!);
     method @Deprecated public void setDivider(android.graphics.drawable.Drawable!);
diff --git a/preference/api/current.txt b/preference/api/current.txt
index 5a60465..d3b0755 100644
--- a/preference/api/current.txt
+++ b/preference/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.preference {
 
   public class CheckBoxPreference extends androidx.preference.TwoStatePreference {
@@ -290,13 +290,9 @@
     method @Deprecated public androidx.preference.DialogPreference! getPreference();
     method @Deprecated protected void onBindDialogView(android.view.View!);
     method @Deprecated public void onClick(android.content.DialogInterface!, int);
-    method @Deprecated public void onCreate(android.os.Bundle!);
-    method @Deprecated public android.app.Dialog onCreateDialog(android.os.Bundle!);
     method @Deprecated protected android.view.View! onCreateDialogView(android.content.Context!);
     method @Deprecated public abstract void onDialogClosed(boolean);
-    method @Deprecated public void onDismiss(android.content.DialogInterface!);
     method @Deprecated protected void onPrepareDialogBuilder(android.app.AlertDialog.Builder!);
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle);
     field @Deprecated protected static final String ARG_KEY = "key";
   }
 
@@ -318,20 +314,13 @@
     method @Deprecated public final androidx.recyclerview.widget.RecyclerView! getListView();
     method @Deprecated public androidx.preference.PreferenceManager! getPreferenceManager();
     method @Deprecated public androidx.preference.PreferenceScreen! getPreferenceScreen();
-    method @Deprecated public void onCreate(android.os.Bundle!);
     method @Deprecated protected androidx.recyclerview.widget.RecyclerView.Adapter! onCreateAdapter(androidx.preference.PreferenceScreen!);
     method @Deprecated public androidx.recyclerview.widget.RecyclerView.LayoutManager! onCreateLayoutManager();
     method @Deprecated public abstract void onCreatePreferences(android.os.Bundle!, String!);
     method @Deprecated public androidx.recyclerview.widget.RecyclerView! onCreateRecyclerView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public android.view.View! onCreateView(android.view.LayoutInflater!, android.view.ViewGroup!, android.os.Bundle!);
-    method @Deprecated public void onDestroyView();
     method @Deprecated public void onDisplayPreferenceDialog(androidx.preference.Preference!);
     method @Deprecated public void onNavigateToScreen(androidx.preference.PreferenceScreen!);
     method @Deprecated public boolean onPreferenceTreeClick(androidx.preference.Preference!);
-    method @Deprecated public void onSaveInstanceState(android.os.Bundle!);
-    method @Deprecated public void onStart();
-    method @Deprecated public void onStop();
-    method @Deprecated public void onViewCreated(android.view.View!, android.os.Bundle!);
     method @Deprecated public void scrollToPreference(String!);
     method @Deprecated public void scrollToPreference(androidx.preference.Preference!);
     method @Deprecated public void setDivider(android.graphics.drawable.Drawable!);
diff --git a/preference/ktx/api/1.1.0-alpha03.txt b/preference/ktx/api/1.1.0-alpha03.txt
index e0d9d02..236569e 100644
--- a/preference/ktx/api/1.1.0-alpha03.txt
+++ b/preference/ktx/api/1.1.0-alpha03.txt
@@ -1,20 +1,20 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.preference {
 
   public final class PreferenceGroupKt {
     ctor public PreferenceGroupKt();
     method public static operator boolean contains(androidx.preference.PreferenceGroup, androidx.preference.Preference preference);
-    method public static void forEach(androidx.preference.PreferenceGroup, kotlin.jvm.functions.Function1<? super androidx.preference.Preference,kotlin.Unit> action);
-    method public static void forEachIndexed(androidx.preference.PreferenceGroup, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super androidx.preference.Preference,kotlin.Unit> action);
-    method public static operator <T extends androidx.preference.Preference> T? get(androidx.preference.PreferenceGroup, CharSequence key);
+    method public static inline void forEach(androidx.preference.PreferenceGroup, kotlin.jvm.functions.Function1<? super androidx.preference.Preference,kotlin.Unit> action);
+    method public static inline void forEachIndexed(androidx.preference.PreferenceGroup, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super androidx.preference.Preference,kotlin.Unit> action);
+    method public static inline operator <T extends androidx.preference.Preference> T? get(androidx.preference.PreferenceGroup, CharSequence key);
     method public static operator androidx.preference.Preference get(androidx.preference.PreferenceGroup, int index);
     method public static kotlin.sequences.Sequence<androidx.preference.Preference> getChildren(androidx.preference.PreferenceGroup);
-    method public static int getSize(androidx.preference.PreferenceGroup);
-    method public static boolean isEmpty(androidx.preference.PreferenceGroup);
-    method public static boolean isNotEmpty(androidx.preference.PreferenceGroup);
+    method public static inline int getSize(androidx.preference.PreferenceGroup);
+    method public static inline boolean isEmpty(androidx.preference.PreferenceGroup);
+    method public static inline boolean isNotEmpty(androidx.preference.PreferenceGroup);
     method public static operator java.util.Iterator<androidx.preference.Preference> iterator(androidx.preference.PreferenceGroup);
-    method public static operator void minusAssign(androidx.preference.PreferenceGroup, androidx.preference.Preference preference);
-    method public static operator void plusAssign(androidx.preference.PreferenceGroup, androidx.preference.Preference preference);
+    method public static inline operator void minusAssign(androidx.preference.PreferenceGroup, androidx.preference.Preference preference);
+    method public static inline operator void plusAssign(androidx.preference.PreferenceGroup, androidx.preference.Preference preference);
   }
 
 }
diff --git a/preference/ktx/api/current.txt b/preference/ktx/api/current.txt
index e0d9d02..236569e 100644
--- a/preference/ktx/api/current.txt
+++ b/preference/ktx/api/current.txt
@@ -1,20 +1,20 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.preference {
 
   public final class PreferenceGroupKt {
     ctor public PreferenceGroupKt();
     method public static operator boolean contains(androidx.preference.PreferenceGroup, androidx.preference.Preference preference);
-    method public static void forEach(androidx.preference.PreferenceGroup, kotlin.jvm.functions.Function1<? super androidx.preference.Preference,kotlin.Unit> action);
-    method public static void forEachIndexed(androidx.preference.PreferenceGroup, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super androidx.preference.Preference,kotlin.Unit> action);
-    method public static operator <T extends androidx.preference.Preference> T? get(androidx.preference.PreferenceGroup, CharSequence key);
+    method public static inline void forEach(androidx.preference.PreferenceGroup, kotlin.jvm.functions.Function1<? super androidx.preference.Preference,kotlin.Unit> action);
+    method public static inline void forEachIndexed(androidx.preference.PreferenceGroup, kotlin.jvm.functions.Function2<? super java.lang.Integer,? super androidx.preference.Preference,kotlin.Unit> action);
+    method public static inline operator <T extends androidx.preference.Preference> T? get(androidx.preference.PreferenceGroup, CharSequence key);
     method public static operator androidx.preference.Preference get(androidx.preference.PreferenceGroup, int index);
     method public static kotlin.sequences.Sequence<androidx.preference.Preference> getChildren(androidx.preference.PreferenceGroup);
-    method public static int getSize(androidx.preference.PreferenceGroup);
-    method public static boolean isEmpty(androidx.preference.PreferenceGroup);
-    method public static boolean isNotEmpty(androidx.preference.PreferenceGroup);
+    method public static inline int getSize(androidx.preference.PreferenceGroup);
+    method public static inline boolean isEmpty(androidx.preference.PreferenceGroup);
+    method public static inline boolean isNotEmpty(androidx.preference.PreferenceGroup);
     method public static operator java.util.Iterator<androidx.preference.Preference> iterator(androidx.preference.PreferenceGroup);
-    method public static operator void minusAssign(androidx.preference.PreferenceGroup, androidx.preference.Preference preference);
-    method public static operator void plusAssign(androidx.preference.PreferenceGroup, androidx.preference.Preference preference);
+    method public static inline operator void minusAssign(androidx.preference.PreferenceGroup, androidx.preference.Preference preference);
+    method public static inline operator void plusAssign(androidx.preference.PreferenceGroup, androidx.preference.Preference preference);
   }
 
 }
diff --git a/print/api/1.0.0.txt b/print/api/1.0.0.txt
index 1ba4459..a780aa9 100644
--- a/print/api/1.0.0.txt
+++ b/print/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.print {
 
   public final class PrintHelper {
diff --git a/print/api/current.txt b/print/api/current.txt
index 1ba4459..a780aa9 100644
--- a/print/api/current.txt
+++ b/print/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.print {
 
   public final class PrintHelper {
diff --git a/recommendation/api/1.0.0.txt b/recommendation/api/1.0.0.txt
index d729b7c..f5c1149 100644
--- a/recommendation/api/1.0.0.txt
+++ b/recommendation/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.recommendation.app {
 
   public final class ContentRecommendation {
diff --git a/recommendation/api/current.txt b/recommendation/api/current.txt
index d729b7c..f5c1149 100644
--- a/recommendation/api/current.txt
+++ b/recommendation/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.recommendation.app {
 
   public final class ContentRecommendation {
diff --git a/recyclerview/recyclerview/api/1.1.0-alpha02.txt b/recyclerview/recyclerview/api/1.1.0-alpha02.txt
index 2102a29..77ecc46 100644
--- a/recyclerview/recyclerview/api/1.1.0-alpha02.txt
+++ b/recyclerview/recyclerview/api/1.1.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.recyclerview.widget {
 
   public final class AdapterListUpdateCallback implements androidx.recyclerview.widget.ListUpdateCallback {
diff --git a/recyclerview/recyclerview/api/current.txt b/recyclerview/recyclerview/api/current.txt
index 2102a29..77ecc46 100644
--- a/recyclerview/recyclerview/api/current.txt
+++ b/recyclerview/recyclerview/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.recyclerview.widget {
 
   public final class AdapterListUpdateCallback implements androidx.recyclerview.widget.ListUpdateCallback {
diff --git a/recyclerview/selection/api/1.1.0-alpha02.txt b/recyclerview/selection/api/1.1.0-alpha02.txt
index 37ddfcb..1b682ce 100644
--- a/recyclerview/selection/api/1.1.0-alpha02.txt
+++ b/recyclerview/selection/api/1.1.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.recyclerview.selection {
 
   public abstract class BandPredicate {
diff --git a/recyclerview/selection/api/current.txt b/recyclerview/selection/api/current.txt
index 37ddfcb..1b682ce 100644
--- a/recyclerview/selection/api/current.txt
+++ b/recyclerview/selection/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.recyclerview.selection {
 
   public abstract class BandPredicate {
diff --git a/remotecallback/api/1.0.0-alpha02.txt b/remotecallback/api/1.0.0-alpha02.txt
index ce29789..213daae 100644
--- a/remotecallback/api/1.0.0-alpha02.txt
+++ b/remotecallback/api/1.0.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.remotecallback {
 
   public class AppWidgetProviderWithCallbacks<T extends androidx.remotecallback.CallbackReceiver> extends android.appwidget.AppWidgetProvider implements androidx.remotecallback.CallbackReceiver<T> {
diff --git a/remotecallback/api/current.txt b/remotecallback/api/current.txt
index ce29789..213daae 100644
--- a/remotecallback/api/current.txt
+++ b/remotecallback/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.remotecallback {
 
   public class AppWidgetProviderWithCallbacks<T extends androidx.remotecallback.CallbackReceiver> extends android.appwidget.AppWidgetProvider implements androidx.remotecallback.CallbackReceiver<T> {
diff --git a/room/common/api/2.1.0-alpha04.txt b/room/common/api/2.1.0-alpha04.txt
index 127708c..67cc6c6 100644
--- a/room/common/api/2.1.0-alpha04.txt
+++ b/room/common/api/2.1.0-alpha04.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.room {
 
   @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface ColumnInfo {
@@ -74,12 +74,12 @@
   @IntDef({androidx.room.ForeignKey.NO_ACTION, androidx.room.ForeignKey.RESTRICT, androidx.room.ForeignKey.SET_NULL, androidx.room.ForeignKey.SET_DEFAULT, androidx.room.ForeignKey.CASCADE}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface ForeignKey.Action {
   }
 
-  @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @RequiresApi(16) public @interface Fts3 {
+  @RequiresApi(16) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) public @interface Fts3 {
     method public abstract String tokenizer() default androidx.room.FtsOptions.TOKENIZER_SIMPLE;
     method public abstract String[] tokenizerArgs() default {};
   }
 
-  @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @RequiresApi(16) public @interface Fts4 {
+  @RequiresApi(16) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) public @interface Fts4 {
     method public abstract Class contentEntity() default java.lang.Object.class;
     method public abstract String languageId() default "";
     method public abstract androidx.room.FtsOptions.MatchInfo matchInfo() default androidx.room.FtsOptions.MatchInfo.FTS4;
@@ -97,12 +97,12 @@
     field @RequiresApi(21) public static final String TOKENIZER_UNICODE61 = "unicode61";
   }
 
-  public static enum FtsOptions.MatchInfo {
+  public enum FtsOptions.MatchInfo {
     enum_constant public static final androidx.room.FtsOptions.MatchInfo FTS3;
     enum_constant public static final androidx.room.FtsOptions.MatchInfo FTS4;
   }
 
-  public static enum FtsOptions.Order {
+  public enum FtsOptions.Order {
     enum_constant public static final androidx.room.FtsOptions.Order ASC;
     enum_constant public static final androidx.room.FtsOptions.Order DESC;
   }
diff --git a/room/common/api/current.txt b/room/common/api/current.txt
index 127708c..67cc6c6 100644
--- a/room/common/api/current.txt
+++ b/room/common/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.room {
 
   @java.lang.annotation.Target({java.lang.annotation.ElementType.FIELD, java.lang.annotation.ElementType.METHOD}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) public @interface ColumnInfo {
@@ -74,12 +74,12 @@
   @IntDef({androidx.room.ForeignKey.NO_ACTION, androidx.room.ForeignKey.RESTRICT, androidx.room.ForeignKey.SET_NULL, androidx.room.ForeignKey.SET_DEFAULT, androidx.room.ForeignKey.CASCADE}) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) public static @interface ForeignKey.Action {
   }
 
-  @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @RequiresApi(16) public @interface Fts3 {
+  @RequiresApi(16) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) public @interface Fts3 {
     method public abstract String tokenizer() default androidx.room.FtsOptions.TOKENIZER_SIMPLE;
     method public abstract String[] tokenizerArgs() default {};
   }
 
-  @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @RequiresApi(16) public @interface Fts4 {
+  @RequiresApi(16) @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.CLASS) @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) public @interface Fts4 {
     method public abstract Class contentEntity() default java.lang.Object.class;
     method public abstract String languageId() default "";
     method public abstract androidx.room.FtsOptions.MatchInfo matchInfo() default androidx.room.FtsOptions.MatchInfo.FTS4;
@@ -97,12 +97,12 @@
     field @RequiresApi(21) public static final String TOKENIZER_UNICODE61 = "unicode61";
   }
 
-  public static enum FtsOptions.MatchInfo {
+  public enum FtsOptions.MatchInfo {
     enum_constant public static final androidx.room.FtsOptions.MatchInfo FTS3;
     enum_constant public static final androidx.room.FtsOptions.MatchInfo FTS4;
   }
 
-  public static enum FtsOptions.Order {
+  public enum FtsOptions.Order {
     enum_constant public static final androidx.room.FtsOptions.Order ASC;
     enum_constant public static final androidx.room.FtsOptions.Order DESC;
   }
diff --git a/room/runtime/api/2.1.0-alpha04.txt b/room/runtime/api/2.1.0-alpha04.txt
index 4efbc8e..d7796fa 100644
--- a/room/runtime/api/2.1.0-alpha04.txt
+++ b/room/runtime/api/2.1.0-alpha04.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.room {
 
   public class DatabaseConfiguration {
@@ -81,7 +81,7 @@
     method public void onOpen(androidx.sqlite.db.SupportSQLiteDatabase);
   }
 
-  public static enum RoomDatabase.JournalMode {
+  public enum RoomDatabase.JournalMode {
     enum_constant public static final androidx.room.RoomDatabase.JournalMode AUTOMATIC;
     enum_constant public static final androidx.room.RoomDatabase.JournalMode TRUNCATE;
     enum_constant @RequiresApi(android.os.Build.VERSION_CODES.JELLY_BEAN) public static final androidx.room.RoomDatabase.JournalMode WRITE_AHEAD_LOGGING;
diff --git a/room/runtime/api/current.txt b/room/runtime/api/current.txt
index 4efbc8e..d7796fa 100644
--- a/room/runtime/api/current.txt
+++ b/room/runtime/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.room {
 
   public class DatabaseConfiguration {
@@ -81,7 +81,7 @@
     method public void onOpen(androidx.sqlite.db.SupportSQLiteDatabase);
   }
 
-  public static enum RoomDatabase.JournalMode {
+  public enum RoomDatabase.JournalMode {
     enum_constant public static final androidx.room.RoomDatabase.JournalMode AUTOMATIC;
     enum_constant public static final androidx.room.RoomDatabase.JournalMode TRUNCATE;
     enum_constant @RequiresApi(android.os.Build.VERSION_CODES.JELLY_BEAN) public static final androidx.room.RoomDatabase.JournalMode WRITE_AHEAD_LOGGING;
diff --git a/room/rxjava2/api/2.1.0-alpha04.txt b/room/rxjava2/api/2.1.0-alpha04.txt
index b92289e3..8a7a0fb 100644
--- a/room/rxjava2/api/2.1.0-alpha04.txt
+++ b/room/rxjava2/api/2.1.0-alpha04.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.room {
 
   public class EmptyResultSetException extends java.lang.RuntimeException {
diff --git a/room/rxjava2/api/current.txt b/room/rxjava2/api/current.txt
index b92289e3..8a7a0fb 100644
--- a/room/rxjava2/api/current.txt
+++ b/room/rxjava2/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.room {
 
   public class EmptyResultSetException extends java.lang.RuntimeException {
diff --git a/room/testing/api/2.1.0-alpha04.txt b/room/testing/api/2.1.0-alpha04.txt
index 27556ec..3d2ed97 100644
--- a/room/testing/api/2.1.0-alpha04.txt
+++ b/room/testing/api/2.1.0-alpha04.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.room.testing {
 
   public class MigrationTestHelper extends org.junit.rules.TestWatcher {
diff --git a/room/testing/api/current.txt b/room/testing/api/current.txt
index 27556ec..3d2ed97 100644
--- a/room/testing/api/current.txt
+++ b/room/testing/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.room.testing {
 
   public class MigrationTestHelper extends org.junit.rules.TestWatcher {
diff --git a/savedstate/bundle/api/1.0.0-alpha01.txt b/savedstate/bundle/api/1.0.0-alpha01.txt
index 44e2567..401346d6 100644
--- a/savedstate/bundle/api/1.0.0-alpha01.txt
+++ b/savedstate/bundle/api/1.0.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.savedstate.bundle {
 
   public final class BundleSavedStateRegistry extends androidx.savedstate.AbstractSavedStateRegistry<android.os.Bundle> {
diff --git a/savedstate/bundle/api/current.txt b/savedstate/bundle/api/current.txt
index 44e2567..401346d6 100644
--- a/savedstate/bundle/api/current.txt
+++ b/savedstate/bundle/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.savedstate.bundle {
 
   public final class BundleSavedStateRegistry extends androidx.savedstate.AbstractSavedStateRegistry<android.os.Bundle> {
diff --git a/savedstate/common/api/1.0.0-alpha01.txt b/savedstate/common/api/1.0.0-alpha01.txt
index 426cfdf..32c9395 100644
--- a/savedstate/common/api/1.0.0-alpha01.txt
+++ b/savedstate/common/api/1.0.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.savedstate {
 
   public abstract class AbstractSavedStateRegistry<S> implements androidx.savedstate.SavedStateRegistry<S> {
diff --git a/savedstate/common/api/current.txt b/savedstate/common/api/current.txt
index 426cfdf..32c9395 100644
--- a/savedstate/common/api/current.txt
+++ b/savedstate/common/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.savedstate {
 
   public abstract class AbstractSavedStateRegistry<S> implements androidx.savedstate.SavedStateRegistry<S> {
diff --git a/sharetarget/api/1.0.0-alpha01.txt b/sharetarget/api/1.0.0-alpha01.txt
index d802177..da4f6cc 100644
--- a/sharetarget/api/1.0.0-alpha01.txt
+++ b/sharetarget/api/1.0.0-alpha01.txt
@@ -1 +1 @@
-// Signature format: 2.0
+// Signature format: 3.0
diff --git a/sharetarget/api/current.txt b/sharetarget/api/current.txt
index d802177..da4f6cc 100644
--- a/sharetarget/api/current.txt
+++ b/sharetarget/api/current.txt
@@ -1 +1 @@
-// Signature format: 2.0
+// Signature format: 3.0
diff --git a/slices/builders/api/1.1.0-alpha01.txt b/slices/builders/api/1.1.0-alpha01.txt
index 791cd1d..606f3bd 100644
--- a/slices/builders/api/1.1.0-alpha01.txt
+++ b/slices/builders/api/1.1.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.slice.builders {
 
   @RequiresApi(19) public class GridRowBuilder {
diff --git a/slices/builders/api/current.txt b/slices/builders/api/current.txt
index 791cd1d..606f3bd 100644
--- a/slices/builders/api/current.txt
+++ b/slices/builders/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.slice.builders {
 
   @RequiresApi(19) public class GridRowBuilder {
diff --git a/slices/builders/ktx/api/1.0.0-alpha6.txt b/slices/builders/ktx/api/1.0.0-alpha6.txt
index 0d90542..d1c4426 100644
--- a/slices/builders/ktx/api/1.0.0-alpha6.txt
+++ b/slices/builders/ktx/api/1.0.0-alpha6.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.slice.builders {
 
   public final class CellBuilderDsl extends androidx.slice.builders.GridRowBuilder.CellBuilder {
@@ -11,8 +11,8 @@
 
   public final class GridRowBuilderKt {
     ctor public GridRowBuilderKt();
-    method public static androidx.slice.builders.GridRowBuilder cell(androidx.slice.builders.GridRowBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.CellBuilderDsl,kotlin.Unit> buildCell);
-    method public static androidx.slice.builders.GridRowBuilder seeMoreCell(androidx.slice.builders.GridRowBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.CellBuilderDsl,kotlin.Unit> buildCell);
+    method public static inline androidx.slice.builders.GridRowBuilder cell(androidx.slice.builders.GridRowBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.CellBuilderDsl,kotlin.Unit> buildCell);
+    method public static inline androidx.slice.builders.GridRowBuilder seeMoreCell(androidx.slice.builders.GridRowBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.CellBuilderDsl,kotlin.Unit> buildCell);
   }
 
   public final class HeaderBuilderDsl extends androidx.slice.builders.ListBuilder.HeaderBuilder {
@@ -29,13 +29,13 @@
 
   public final class ListBuilderKt {
     ctor public ListBuilderKt();
-    method public static androidx.slice.builders.ListBuilder gridRow(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.GridRowBuilderDsl,kotlin.Unit> buildGrid);
-    method public static androidx.slice.builders.ListBuilder header(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.HeaderBuilderDsl,kotlin.Unit> buildHeader);
-    method public static androidx.slice.builders.ListBuilder inputRange(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.InputRangeBuilderDsl,kotlin.Unit> buildInputRange);
-    method public static androidx.slice.Slice list(android.content.Context context, android.net.Uri uri, long ttl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.ListBuilderDsl,kotlin.Unit> addRows);
-    method public static androidx.slice.builders.ListBuilder range(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.RangeBuilderDsl,kotlin.Unit> buildRange);
-    method public static androidx.slice.builders.ListBuilder row(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.RowBuilderDsl,kotlin.Unit> buildRow);
-    method public static androidx.slice.builders.ListBuilder seeMoreRow(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.RowBuilderDsl,kotlin.Unit> buildRow);
+    method public static inline androidx.slice.builders.ListBuilder gridRow(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.GridRowBuilderDsl,kotlin.Unit> buildGrid);
+    method public static inline androidx.slice.builders.ListBuilder header(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.HeaderBuilderDsl,kotlin.Unit> buildHeader);
+    method public static inline androidx.slice.builders.ListBuilder inputRange(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.InputRangeBuilderDsl,kotlin.Unit> buildInputRange);
+    method public static inline androidx.slice.Slice list(android.content.Context context, android.net.Uri uri, long ttl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.ListBuilderDsl,kotlin.Unit> addRows);
+    method public static inline androidx.slice.builders.ListBuilder range(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.RangeBuilderDsl,kotlin.Unit> buildRange);
+    method public static inline androidx.slice.builders.ListBuilder row(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.RowBuilderDsl,kotlin.Unit> buildRow);
+    method public static inline androidx.slice.builders.ListBuilder seeMoreRow(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.RowBuilderDsl,kotlin.Unit> buildRow);
     method public static androidx.slice.builders.SliceAction tapSliceAction(android.app.PendingIntent pendingIntent, androidx.core.graphics.drawable.IconCompat icon, @androidx.slice.builders.ListBuilder.ImageMode int imageMode = 0, CharSequence title);
     method public static androidx.slice.builders.SliceAction toggleSliceAction(android.app.PendingIntent pendingIntent, androidx.core.graphics.drawable.IconCompat? icon = null, CharSequence title, boolean isChecked);
   }
diff --git a/slices/builders/ktx/api/current.txt b/slices/builders/ktx/api/current.txt
index 0d90542..d1c4426 100644
--- a/slices/builders/ktx/api/current.txt
+++ b/slices/builders/ktx/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.slice.builders {
 
   public final class CellBuilderDsl extends androidx.slice.builders.GridRowBuilder.CellBuilder {
@@ -11,8 +11,8 @@
 
   public final class GridRowBuilderKt {
     ctor public GridRowBuilderKt();
-    method public static androidx.slice.builders.GridRowBuilder cell(androidx.slice.builders.GridRowBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.CellBuilderDsl,kotlin.Unit> buildCell);
-    method public static androidx.slice.builders.GridRowBuilder seeMoreCell(androidx.slice.builders.GridRowBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.CellBuilderDsl,kotlin.Unit> buildCell);
+    method public static inline androidx.slice.builders.GridRowBuilder cell(androidx.slice.builders.GridRowBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.CellBuilderDsl,kotlin.Unit> buildCell);
+    method public static inline androidx.slice.builders.GridRowBuilder seeMoreCell(androidx.slice.builders.GridRowBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.CellBuilderDsl,kotlin.Unit> buildCell);
   }
 
   public final class HeaderBuilderDsl extends androidx.slice.builders.ListBuilder.HeaderBuilder {
@@ -29,13 +29,13 @@
 
   public final class ListBuilderKt {
     ctor public ListBuilderKt();
-    method public static androidx.slice.builders.ListBuilder gridRow(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.GridRowBuilderDsl,kotlin.Unit> buildGrid);
-    method public static androidx.slice.builders.ListBuilder header(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.HeaderBuilderDsl,kotlin.Unit> buildHeader);
-    method public static androidx.slice.builders.ListBuilder inputRange(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.InputRangeBuilderDsl,kotlin.Unit> buildInputRange);
-    method public static androidx.slice.Slice list(android.content.Context context, android.net.Uri uri, long ttl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.ListBuilderDsl,kotlin.Unit> addRows);
-    method public static androidx.slice.builders.ListBuilder range(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.RangeBuilderDsl,kotlin.Unit> buildRange);
-    method public static androidx.slice.builders.ListBuilder row(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.RowBuilderDsl,kotlin.Unit> buildRow);
-    method public static androidx.slice.builders.ListBuilder seeMoreRow(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.RowBuilderDsl,kotlin.Unit> buildRow);
+    method public static inline androidx.slice.builders.ListBuilder gridRow(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.GridRowBuilderDsl,kotlin.Unit> buildGrid);
+    method public static inline androidx.slice.builders.ListBuilder header(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.HeaderBuilderDsl,kotlin.Unit> buildHeader);
+    method public static inline androidx.slice.builders.ListBuilder inputRange(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.InputRangeBuilderDsl,kotlin.Unit> buildInputRange);
+    method public static inline androidx.slice.Slice list(android.content.Context context, android.net.Uri uri, long ttl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.ListBuilderDsl,kotlin.Unit> addRows);
+    method public static inline androidx.slice.builders.ListBuilder range(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.RangeBuilderDsl,kotlin.Unit> buildRange);
+    method public static inline androidx.slice.builders.ListBuilder row(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.RowBuilderDsl,kotlin.Unit> buildRow);
+    method public static inline androidx.slice.builders.ListBuilder seeMoreRow(androidx.slice.builders.ListBuilderDsl, kotlin.jvm.functions.Function1<? super androidx.slice.builders.RowBuilderDsl,kotlin.Unit> buildRow);
     method public static androidx.slice.builders.SliceAction tapSliceAction(android.app.PendingIntent pendingIntent, androidx.core.graphics.drawable.IconCompat icon, @androidx.slice.builders.ListBuilder.ImageMode int imageMode = 0, CharSequence title);
     method public static androidx.slice.builders.SliceAction toggleSliceAction(android.app.PendingIntent pendingIntent, androidx.core.graphics.drawable.IconCompat? icon = null, CharSequence title, boolean isChecked);
   }
diff --git a/slices/core/api/1.1.0-alpha01.txt b/slices/core/api/1.1.0-alpha01.txt
index 3c3e69a..71a21ad 100644
--- a/slices/core/api/1.1.0-alpha01.txt
+++ b/slices/core/api/1.1.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.slice {
 
   @RequiresApi(19) public final class Slice extends androidx.versionedparcelable.CustomVersionedParcelable implements androidx.versionedparcelable.VersionedParcelable {
@@ -45,7 +45,7 @@
     method public final int delete(android.net.Uri, String?, String[]?);
     method @RequiresApi(19) public java.util.List<android.net.Uri> getPinnedSlices();
     method public final String! getType(android.net.Uri!);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) @RequiresApi(19) public Object! getWrapper();
+    method @RequiresApi(19) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public Object! getWrapper();
     method public final android.net.Uri? insert(android.net.Uri, android.content.ContentValues?);
     method @RequiresApi(19) public abstract androidx.slice.Slice! onBindSlice(android.net.Uri!);
     method public final boolean onCreate();
diff --git a/slices/core/api/current.txt b/slices/core/api/current.txt
index 3c3e69a..71a21ad 100644
--- a/slices/core/api/current.txt
+++ b/slices/core/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.slice {
 
   @RequiresApi(19) public final class Slice extends androidx.versionedparcelable.CustomVersionedParcelable implements androidx.versionedparcelable.VersionedParcelable {
@@ -45,7 +45,7 @@
     method public final int delete(android.net.Uri, String?, String[]?);
     method @RequiresApi(19) public java.util.List<android.net.Uri> getPinnedSlices();
     method public final String! getType(android.net.Uri!);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) @RequiresApi(19) public Object! getWrapper();
+    method @RequiresApi(19) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY) public Object! getWrapper();
     method public final android.net.Uri? insert(android.net.Uri, android.content.ContentValues?);
     method @RequiresApi(19) public abstract androidx.slice.Slice! onBindSlice(android.net.Uri!);
     method public final boolean onCreate();
diff --git a/slices/view/api/1.1.0-alpha01.txt b/slices/view/api/1.1.0-alpha01.txt
index b6acced..e6ce12a 100644
--- a/slices/view/api/1.1.0-alpha01.txt
+++ b/slices/view/api/1.1.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.slice {
 
   @RequiresApi(19) public class SliceMetadata {
diff --git a/slices/view/api/current.txt b/slices/view/api/current.txt
index b6acced..e6ce12a 100644
--- a/slices/view/api/current.txt
+++ b/slices/view/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.slice {
 
   @RequiresApi(19) public class SliceMetadata {
diff --git a/slidingpanelayout/api/1.0.0.txt b/slidingpanelayout/api/1.0.0.txt
index fa97413..fc3aa2f 100644
--- a/slidingpanelayout/api/1.0.0.txt
+++ b/slidingpanelayout/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.slidingpanelayout.widget {
 
   public class SlidingPaneLayout extends android.view.ViewGroup {
diff --git a/slidingpanelayout/api/current.txt b/slidingpanelayout/api/current.txt
index fa97413..fc3aa2f 100644
--- a/slidingpanelayout/api/current.txt
+++ b/slidingpanelayout/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.slidingpanelayout.widget {
 
   public class SlidingPaneLayout extends android.view.ViewGroup {
diff --git a/swiperefreshlayout/api/1.1.0-alpha01.txt b/swiperefreshlayout/api/1.1.0-alpha01.txt
index 26a01ea..5f5a01e 100644
--- a/swiperefreshlayout/api/1.1.0-alpha01.txt
+++ b/swiperefreshlayout/api/1.1.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.swiperefreshlayout.widget {
 
   public class CircularProgressDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Animatable {
diff --git a/swiperefreshlayout/api/current.txt b/swiperefreshlayout/api/current.txt
index 26a01ea..5f5a01e 100644
--- a/swiperefreshlayout/api/current.txt
+++ b/swiperefreshlayout/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.swiperefreshlayout.widget {
 
   public class CircularProgressDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Animatable {
diff --git a/textclassifier/api/1.0.0-alpha02.txt b/textclassifier/api/1.0.0-alpha02.txt
index 917a84d..043c858 100644
--- a/textclassifier/api/1.0.0-alpha02.txt
+++ b/textclassifier/api/1.0.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.textclassifier {
 
   public final class TextClassification {
diff --git a/textclassifier/api/current.txt b/textclassifier/api/current.txt
index 917a84d..043c858 100644
--- a/textclassifier/api/current.txt
+++ b/textclassifier/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.textclassifier {
 
   public final class TextClassification {
diff --git a/transition/api/1.1.0-alpha02.txt b/transition/api/1.1.0-alpha02.txt
index b834b25..86a584c 100644
--- a/transition/api/1.1.0-alpha02.txt
+++ b/transition/api/1.1.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.transition {
 
   public class ArcMotion extends androidx.transition.PathMotion {
diff --git a/transition/api/current.txt b/transition/api/current.txt
index b834b25..86a584c 100644
--- a/transition/api/current.txt
+++ b/transition/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.transition {
 
   public class ArcMotion extends androidx.transition.PathMotion {
diff --git a/tv-provider/api/1.0.0.txt b/tv-provider/api/1.0.0.txt
index 78580f3..a3dc91d 100644
--- a/tv-provider/api/1.0.0.txt
+++ b/tv-provider/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.tvprovider.media.tv {
 
   public final class Channel {
@@ -137,9 +137,60 @@
 
   public final class PreviewProgram {
     method public static androidx.tvprovider.media.tv.PreviewProgram! fromCursor(android.database.Cursor!);
+    method public String[]! getAudioLanguages();
+    method public String! getAuthor();
+    method public int getAvailability();
+    method public String[]! getCanonicalGenres();
     method public long getChannelId();
+    method public String! getContentId();
+    method public android.media.tv.TvContentRating[]! getContentRatings();
+    method public String! getDescription();
+    method public int getDurationMillis();
+    method public long getEndTimeUtcMillis();
+    method public String! getEpisodeNumber();
+    method public String! getEpisodeTitle();
+    method public String! getGenre();
+    method public long getId();
+    method public android.content.Intent! getIntent() throws java.net.URISyntaxException;
+    method public android.net.Uri! getIntentUri();
+    method public long getInteractionCount();
+    method public int getInteractionType();
+    method public byte[]! getInternalProviderDataByteArray();
+    method public Long! getInternalProviderFlag1();
+    method public Long! getInternalProviderFlag2();
+    method public Long! getInternalProviderFlag3();
+    method public Long! getInternalProviderFlag4();
+    method public String! getInternalProviderId();
+    method public int getItemCount();
+    method public int getLastPlaybackPositionMillis();
+    method public String! getLogoContentDescription();
+    method public android.net.Uri! getLogoUri();
+    method public String! getLongDescription();
+    method public String! getOfferPrice();
+    method public int getPosterArtAspectRatio();
+    method public android.net.Uri! getPosterArtUri();
+    method public android.net.Uri! getPreviewAudioUri();
+    method public android.net.Uri! getPreviewVideoUri();
+    method public String! getReleaseDate();
+    method public String! getReviewRating();
+    method public int getReviewRatingStyle();
+    method public String! getSeasonNumber();
+    method public String! getSeasonTitle();
+    method public long getStartTimeUtcMillis();
+    method public String! getStartingPrice();
+    method public int getThumbnailAspectRatio();
+    method public android.net.Uri! getThumbnailUri();
+    method public String! getTitle();
+    method public int getTvSeriesItemType();
+    method public int getType();
+    method public int getVideoHeight();
+    method public int getVideoWidth();
     method public int getWeight();
     method public boolean hasAnyUpdatedValues(androidx.tvprovider.media.tv.PreviewProgram!);
+    method public boolean isBrowsable();
+    method public boolean isLive();
+    method public boolean isSearchable();
+    method public boolean isTransient();
     method public android.content.ContentValues! toContentValues();
   }
 
@@ -147,73 +198,41 @@
     ctor public PreviewProgram.Builder();
     ctor public PreviewProgram.Builder(androidx.tvprovider.media.tv.PreviewProgram!);
     method public androidx.tvprovider.media.tv.PreviewProgram! build();
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setAudioLanguages(String[]!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setAuthor(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setAvailability(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setBrowsable(boolean);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setCanonicalGenres(String[]!);
     method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setChannelId(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setContentId(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setContentRatings(android.media.tv.TvContentRating[]!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setDescription(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setDurationMillis(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setEndTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setEpisodeNumber(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setEpisodeNumber(String!, int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setEpisodeTitle(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setGenre(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setId(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setIntent(android.content.Intent!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setIntentUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInteractionCount(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInteractionType(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInternalProviderData(byte[]!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInternalProviderFlag1(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInternalProviderFlag2(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInternalProviderFlag3(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInternalProviderFlag4(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInternalProviderId(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setItemCount(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setLastPlaybackPositionMillis(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setLive(boolean);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setLogoContentDescription(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setLogoUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setLongDescription(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setOfferPrice(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setPackageName(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setPosterArtAspectRatio(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setPosterArtUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setPreviewAudioUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setPreviewVideoUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setReleaseDate(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setReleaseDate(java.util.Date!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setReviewRating(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setReviewRatingStyle(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setSearchable(boolean);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setSeasonNumber(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setSeasonNumber(String!, int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setSeasonTitle(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setStartTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setStartingPrice(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setThumbnailAspectRatio(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setThumbnailUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setTitle(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setTransient(boolean);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setTvSeriesItemType(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setType(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setVideoHeight(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setVideoWidth(int);
     method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setWeight(int);
   }
 
   public final class Program implements java.lang.Comparable<androidx.tvprovider.media.tv.Program> {
     method public int compareTo(androidx.tvprovider.media.tv.Program);
     method public static androidx.tvprovider.media.tv.Program! fromCursor(android.database.Cursor!);
+    method public String[]! getAudioLanguages();
     method public String[]! getBroadcastGenres();
+    method public String[]! getCanonicalGenres();
     method public long getChannelId();
+    method public android.media.tv.TvContentRating[]! getContentRatings();
+    method public String! getDescription();
     method public long getEndTimeUtcMillis();
+    method public String! getEpisodeNumber();
+    method public String! getEpisodeTitle();
+    method public long getId();
+    method public byte[]! getInternalProviderDataByteArray();
+    method public Long! getInternalProviderFlag1();
+    method public Long! getInternalProviderFlag2();
+    method public Long! getInternalProviderFlag3();
+    method public Long! getInternalProviderFlag4();
+    method public String! getLongDescription();
+    method public android.net.Uri! getPosterArtUri();
+    method public String! getReviewRating();
+    method public int getReviewRatingStyle();
+    method public String! getSeasonNumber();
+    method public String! getSeasonTitle();
     method public long getStartTimeUtcMillis();
+    method public android.net.Uri! getThumbnailUri();
+    method public String! getTitle();
+    method public int getVideoHeight();
+    method public int getVideoWidth();
     method public boolean isRecordingProhibited();
+    method public boolean isSearchable();
     method public android.content.ContentValues! toContentValues();
   }
 
@@ -221,37 +240,11 @@
     ctor public Program.Builder();
     ctor public Program.Builder(androidx.tvprovider.media.tv.Program!);
     method public androidx.tvprovider.media.tv.Program! build();
-    method public androidx.tvprovider.media.tv.Program.Builder! setAudioLanguages(String[]!);
     method public androidx.tvprovider.media.tv.Program.Builder! setBroadcastGenres(String[]!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setCanonicalGenres(String[]!);
     method public androidx.tvprovider.media.tv.Program.Builder! setChannelId(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setContentRatings(android.media.tv.TvContentRating[]!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setDescription(String!);
     method public androidx.tvprovider.media.tv.Program.Builder! setEndTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setEpisodeNumber(int);
-    method public androidx.tvprovider.media.tv.Program.Builder! setEpisodeNumber(String!, int);
-    method public androidx.tvprovider.media.tv.Program.Builder! setEpisodeTitle(String!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setId(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setInternalProviderData(byte[]!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setInternalProviderFlag1(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setInternalProviderFlag2(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setInternalProviderFlag3(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setInternalProviderFlag4(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setLongDescription(String!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setPackageName(String!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setPosterArtUri(android.net.Uri!);
     method public androidx.tvprovider.media.tv.Program.Builder! setRecordingProhibited(boolean);
-    method public androidx.tvprovider.media.tv.Program.Builder! setReviewRating(String!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setReviewRatingStyle(int);
-    method public androidx.tvprovider.media.tv.Program.Builder! setSearchable(boolean);
-    method public androidx.tvprovider.media.tv.Program.Builder! setSeasonNumber(int);
-    method public androidx.tvprovider.media.tv.Program.Builder! setSeasonNumber(String!, int);
-    method public androidx.tvprovider.media.tv.Program.Builder! setSeasonTitle(String!);
     method public androidx.tvprovider.media.tv.Program.Builder! setStartTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setThumbnailUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setTitle(String!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setVideoHeight(int);
-    method public androidx.tvprovider.media.tv.Program.Builder! setVideoWidth(int);
   }
 
   public final class TvContractCompat {
@@ -673,9 +666,60 @@
 
   public final class WatchNextProgram {
     method public static androidx.tvprovider.media.tv.WatchNextProgram! fromCursor(android.database.Cursor!);
+    method public String[]! getAudioLanguages();
+    method public String! getAuthor();
+    method public int getAvailability();
+    method public String[]! getCanonicalGenres();
+    method public String! getContentId();
+    method public android.media.tv.TvContentRating[]! getContentRatings();
+    method public String! getDescription();
+    method public int getDurationMillis();
+    method public long getEndTimeUtcMillis();
+    method public String! getEpisodeNumber();
+    method public String! getEpisodeTitle();
+    method public String! getGenre();
+    method public long getId();
+    method public android.content.Intent! getIntent() throws java.net.URISyntaxException;
+    method public android.net.Uri! getIntentUri();
+    method public long getInteractionCount();
+    method public int getInteractionType();
+    method public byte[]! getInternalProviderDataByteArray();
+    method public Long! getInternalProviderFlag1();
+    method public Long! getInternalProviderFlag2();
+    method public Long! getInternalProviderFlag3();
+    method public Long! getInternalProviderFlag4();
+    method public String! getInternalProviderId();
+    method public int getItemCount();
     method public long getLastEngagementTimeUtcMillis();
+    method public int getLastPlaybackPositionMillis();
+    method public String! getLogoContentDescription();
+    method public android.net.Uri! getLogoUri();
+    method public String! getLongDescription();
+    method public String! getOfferPrice();
+    method public int getPosterArtAspectRatio();
+    method public android.net.Uri! getPosterArtUri();
+    method public android.net.Uri! getPreviewAudioUri();
+    method public android.net.Uri! getPreviewVideoUri();
+    method public String! getReleaseDate();
+    method public String! getReviewRating();
+    method public int getReviewRatingStyle();
+    method public String! getSeasonNumber();
+    method public String! getSeasonTitle();
+    method public long getStartTimeUtcMillis();
+    method public String! getStartingPrice();
+    method public int getThumbnailAspectRatio();
+    method public android.net.Uri! getThumbnailUri();
+    method public String! getTitle();
+    method public int getTvSeriesItemType();
+    method public int getType();
+    method public int getVideoHeight();
+    method public int getVideoWidth();
     method public int getWatchNextType();
     method public boolean hasAnyUpdatedValues(androidx.tvprovider.media.tv.WatchNextProgram!);
+    method public boolean isBrowsable();
+    method public boolean isLive();
+    method public boolean isSearchable();
+    method public boolean isTransient();
     method public android.content.ContentValues! toContentValues();
     field public static final int WATCH_NEXT_TYPE_UNKNOWN = -1; // 0xffffffff
   }
@@ -684,62 +728,7 @@
     ctor public WatchNextProgram.Builder();
     ctor public WatchNextProgram.Builder(androidx.tvprovider.media.tv.WatchNextProgram!);
     method public androidx.tvprovider.media.tv.WatchNextProgram! build();
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setAudioLanguages(String[]!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setAuthor(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setAvailability(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setBrowsable(boolean);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setCanonicalGenres(String[]!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setContentId(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setContentRatings(android.media.tv.TvContentRating[]!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setDescription(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setDurationMillis(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setEndTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setEpisodeNumber(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setEpisodeNumber(String!, int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setEpisodeTitle(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setGenre(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setId(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setIntent(android.content.Intent!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setIntentUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInteractionCount(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInteractionType(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInternalProviderData(byte[]!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInternalProviderFlag1(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInternalProviderFlag2(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInternalProviderFlag3(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInternalProviderFlag4(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInternalProviderId(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setItemCount(int);
     method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setLastEngagementTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setLastPlaybackPositionMillis(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setLive(boolean);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setLogoContentDescription(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setLogoUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setLongDescription(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setOfferPrice(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setPackageName(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setPosterArtAspectRatio(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setPosterArtUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setPreviewAudioUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setPreviewVideoUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setReleaseDate(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setReleaseDate(java.util.Date!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setReviewRating(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setReviewRatingStyle(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setSearchable(boolean);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setSeasonNumber(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setSeasonNumber(String!, int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setSeasonTitle(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setStartTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setStartingPrice(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setThumbnailAspectRatio(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setThumbnailUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setTitle(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setTransient(boolean);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setTvSeriesItemType(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setType(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setVideoHeight(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setVideoWidth(int);
     method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setWatchNextType(int);
   }
 
diff --git a/tv-provider/api/current.txt b/tv-provider/api/current.txt
index 78580f3..a3dc91d 100644
--- a/tv-provider/api/current.txt
+++ b/tv-provider/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.tvprovider.media.tv {
 
   public final class Channel {
@@ -137,9 +137,60 @@
 
   public final class PreviewProgram {
     method public static androidx.tvprovider.media.tv.PreviewProgram! fromCursor(android.database.Cursor!);
+    method public String[]! getAudioLanguages();
+    method public String! getAuthor();
+    method public int getAvailability();
+    method public String[]! getCanonicalGenres();
     method public long getChannelId();
+    method public String! getContentId();
+    method public android.media.tv.TvContentRating[]! getContentRatings();
+    method public String! getDescription();
+    method public int getDurationMillis();
+    method public long getEndTimeUtcMillis();
+    method public String! getEpisodeNumber();
+    method public String! getEpisodeTitle();
+    method public String! getGenre();
+    method public long getId();
+    method public android.content.Intent! getIntent() throws java.net.URISyntaxException;
+    method public android.net.Uri! getIntentUri();
+    method public long getInteractionCount();
+    method public int getInteractionType();
+    method public byte[]! getInternalProviderDataByteArray();
+    method public Long! getInternalProviderFlag1();
+    method public Long! getInternalProviderFlag2();
+    method public Long! getInternalProviderFlag3();
+    method public Long! getInternalProviderFlag4();
+    method public String! getInternalProviderId();
+    method public int getItemCount();
+    method public int getLastPlaybackPositionMillis();
+    method public String! getLogoContentDescription();
+    method public android.net.Uri! getLogoUri();
+    method public String! getLongDescription();
+    method public String! getOfferPrice();
+    method public int getPosterArtAspectRatio();
+    method public android.net.Uri! getPosterArtUri();
+    method public android.net.Uri! getPreviewAudioUri();
+    method public android.net.Uri! getPreviewVideoUri();
+    method public String! getReleaseDate();
+    method public String! getReviewRating();
+    method public int getReviewRatingStyle();
+    method public String! getSeasonNumber();
+    method public String! getSeasonTitle();
+    method public long getStartTimeUtcMillis();
+    method public String! getStartingPrice();
+    method public int getThumbnailAspectRatio();
+    method public android.net.Uri! getThumbnailUri();
+    method public String! getTitle();
+    method public int getTvSeriesItemType();
+    method public int getType();
+    method public int getVideoHeight();
+    method public int getVideoWidth();
     method public int getWeight();
     method public boolean hasAnyUpdatedValues(androidx.tvprovider.media.tv.PreviewProgram!);
+    method public boolean isBrowsable();
+    method public boolean isLive();
+    method public boolean isSearchable();
+    method public boolean isTransient();
     method public android.content.ContentValues! toContentValues();
   }
 
@@ -147,73 +198,41 @@
     ctor public PreviewProgram.Builder();
     ctor public PreviewProgram.Builder(androidx.tvprovider.media.tv.PreviewProgram!);
     method public androidx.tvprovider.media.tv.PreviewProgram! build();
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setAudioLanguages(String[]!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setAuthor(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setAvailability(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setBrowsable(boolean);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setCanonicalGenres(String[]!);
     method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setChannelId(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setContentId(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setContentRatings(android.media.tv.TvContentRating[]!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setDescription(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setDurationMillis(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setEndTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setEpisodeNumber(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setEpisodeNumber(String!, int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setEpisodeTitle(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setGenre(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setId(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setIntent(android.content.Intent!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setIntentUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInteractionCount(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInteractionType(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInternalProviderData(byte[]!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInternalProviderFlag1(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInternalProviderFlag2(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInternalProviderFlag3(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInternalProviderFlag4(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setInternalProviderId(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setItemCount(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setLastPlaybackPositionMillis(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setLive(boolean);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setLogoContentDescription(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setLogoUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setLongDescription(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setOfferPrice(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setPackageName(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setPosterArtAspectRatio(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setPosterArtUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setPreviewAudioUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setPreviewVideoUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setReleaseDate(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setReleaseDate(java.util.Date!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setReviewRating(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setReviewRatingStyle(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setSearchable(boolean);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setSeasonNumber(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setSeasonNumber(String!, int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setSeasonTitle(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setStartTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setStartingPrice(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setThumbnailAspectRatio(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setThumbnailUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setTitle(String!);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setTransient(boolean);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setTvSeriesItemType(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setType(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setVideoHeight(int);
-    method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setVideoWidth(int);
     method public androidx.tvprovider.media.tv.PreviewProgram.Builder! setWeight(int);
   }
 
   public final class Program implements java.lang.Comparable<androidx.tvprovider.media.tv.Program> {
     method public int compareTo(androidx.tvprovider.media.tv.Program);
     method public static androidx.tvprovider.media.tv.Program! fromCursor(android.database.Cursor!);
+    method public String[]! getAudioLanguages();
     method public String[]! getBroadcastGenres();
+    method public String[]! getCanonicalGenres();
     method public long getChannelId();
+    method public android.media.tv.TvContentRating[]! getContentRatings();
+    method public String! getDescription();
     method public long getEndTimeUtcMillis();
+    method public String! getEpisodeNumber();
+    method public String! getEpisodeTitle();
+    method public long getId();
+    method public byte[]! getInternalProviderDataByteArray();
+    method public Long! getInternalProviderFlag1();
+    method public Long! getInternalProviderFlag2();
+    method public Long! getInternalProviderFlag3();
+    method public Long! getInternalProviderFlag4();
+    method public String! getLongDescription();
+    method public android.net.Uri! getPosterArtUri();
+    method public String! getReviewRating();
+    method public int getReviewRatingStyle();
+    method public String! getSeasonNumber();
+    method public String! getSeasonTitle();
     method public long getStartTimeUtcMillis();
+    method public android.net.Uri! getThumbnailUri();
+    method public String! getTitle();
+    method public int getVideoHeight();
+    method public int getVideoWidth();
     method public boolean isRecordingProhibited();
+    method public boolean isSearchable();
     method public android.content.ContentValues! toContentValues();
   }
 
@@ -221,37 +240,11 @@
     ctor public Program.Builder();
     ctor public Program.Builder(androidx.tvprovider.media.tv.Program!);
     method public androidx.tvprovider.media.tv.Program! build();
-    method public androidx.tvprovider.media.tv.Program.Builder! setAudioLanguages(String[]!);
     method public androidx.tvprovider.media.tv.Program.Builder! setBroadcastGenres(String[]!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setCanonicalGenres(String[]!);
     method public androidx.tvprovider.media.tv.Program.Builder! setChannelId(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setContentRatings(android.media.tv.TvContentRating[]!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setDescription(String!);
     method public androidx.tvprovider.media.tv.Program.Builder! setEndTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setEpisodeNumber(int);
-    method public androidx.tvprovider.media.tv.Program.Builder! setEpisodeNumber(String!, int);
-    method public androidx.tvprovider.media.tv.Program.Builder! setEpisodeTitle(String!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setId(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setInternalProviderData(byte[]!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setInternalProviderFlag1(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setInternalProviderFlag2(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setInternalProviderFlag3(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setInternalProviderFlag4(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setLongDescription(String!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setPackageName(String!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setPosterArtUri(android.net.Uri!);
     method public androidx.tvprovider.media.tv.Program.Builder! setRecordingProhibited(boolean);
-    method public androidx.tvprovider.media.tv.Program.Builder! setReviewRating(String!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setReviewRatingStyle(int);
-    method public androidx.tvprovider.media.tv.Program.Builder! setSearchable(boolean);
-    method public androidx.tvprovider.media.tv.Program.Builder! setSeasonNumber(int);
-    method public androidx.tvprovider.media.tv.Program.Builder! setSeasonNumber(String!, int);
-    method public androidx.tvprovider.media.tv.Program.Builder! setSeasonTitle(String!);
     method public androidx.tvprovider.media.tv.Program.Builder! setStartTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.Program.Builder! setThumbnailUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setTitle(String!);
-    method public androidx.tvprovider.media.tv.Program.Builder! setVideoHeight(int);
-    method public androidx.tvprovider.media.tv.Program.Builder! setVideoWidth(int);
   }
 
   public final class TvContractCompat {
@@ -673,9 +666,60 @@
 
   public final class WatchNextProgram {
     method public static androidx.tvprovider.media.tv.WatchNextProgram! fromCursor(android.database.Cursor!);
+    method public String[]! getAudioLanguages();
+    method public String! getAuthor();
+    method public int getAvailability();
+    method public String[]! getCanonicalGenres();
+    method public String! getContentId();
+    method public android.media.tv.TvContentRating[]! getContentRatings();
+    method public String! getDescription();
+    method public int getDurationMillis();
+    method public long getEndTimeUtcMillis();
+    method public String! getEpisodeNumber();
+    method public String! getEpisodeTitle();
+    method public String! getGenre();
+    method public long getId();
+    method public android.content.Intent! getIntent() throws java.net.URISyntaxException;
+    method public android.net.Uri! getIntentUri();
+    method public long getInteractionCount();
+    method public int getInteractionType();
+    method public byte[]! getInternalProviderDataByteArray();
+    method public Long! getInternalProviderFlag1();
+    method public Long! getInternalProviderFlag2();
+    method public Long! getInternalProviderFlag3();
+    method public Long! getInternalProviderFlag4();
+    method public String! getInternalProviderId();
+    method public int getItemCount();
     method public long getLastEngagementTimeUtcMillis();
+    method public int getLastPlaybackPositionMillis();
+    method public String! getLogoContentDescription();
+    method public android.net.Uri! getLogoUri();
+    method public String! getLongDescription();
+    method public String! getOfferPrice();
+    method public int getPosterArtAspectRatio();
+    method public android.net.Uri! getPosterArtUri();
+    method public android.net.Uri! getPreviewAudioUri();
+    method public android.net.Uri! getPreviewVideoUri();
+    method public String! getReleaseDate();
+    method public String! getReviewRating();
+    method public int getReviewRatingStyle();
+    method public String! getSeasonNumber();
+    method public String! getSeasonTitle();
+    method public long getStartTimeUtcMillis();
+    method public String! getStartingPrice();
+    method public int getThumbnailAspectRatio();
+    method public android.net.Uri! getThumbnailUri();
+    method public String! getTitle();
+    method public int getTvSeriesItemType();
+    method public int getType();
+    method public int getVideoHeight();
+    method public int getVideoWidth();
     method public int getWatchNextType();
     method public boolean hasAnyUpdatedValues(androidx.tvprovider.media.tv.WatchNextProgram!);
+    method public boolean isBrowsable();
+    method public boolean isLive();
+    method public boolean isSearchable();
+    method public boolean isTransient();
     method public android.content.ContentValues! toContentValues();
     field public static final int WATCH_NEXT_TYPE_UNKNOWN = -1; // 0xffffffff
   }
@@ -684,62 +728,7 @@
     ctor public WatchNextProgram.Builder();
     ctor public WatchNextProgram.Builder(androidx.tvprovider.media.tv.WatchNextProgram!);
     method public androidx.tvprovider.media.tv.WatchNextProgram! build();
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setAudioLanguages(String[]!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setAuthor(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setAvailability(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setBrowsable(boolean);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setCanonicalGenres(String[]!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setContentId(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setContentRatings(android.media.tv.TvContentRating[]!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setDescription(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setDurationMillis(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setEndTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setEpisodeNumber(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setEpisodeNumber(String!, int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setEpisodeTitle(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setGenre(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setId(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setIntent(android.content.Intent!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setIntentUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInteractionCount(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInteractionType(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInternalProviderData(byte[]!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInternalProviderFlag1(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInternalProviderFlag2(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInternalProviderFlag3(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInternalProviderFlag4(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setInternalProviderId(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setItemCount(int);
     method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setLastEngagementTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setLastPlaybackPositionMillis(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setLive(boolean);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setLogoContentDescription(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setLogoUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setLongDescription(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setOfferPrice(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setPackageName(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setPosterArtAspectRatio(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setPosterArtUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setPreviewAudioUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setPreviewVideoUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setReleaseDate(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setReleaseDate(java.util.Date!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setReviewRating(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setReviewRatingStyle(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setSearchable(boolean);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setSeasonNumber(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setSeasonNumber(String!, int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setSeasonTitle(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setStartTimeUtcMillis(long);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setStartingPrice(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setThumbnailAspectRatio(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setThumbnailUri(android.net.Uri!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setTitle(String!);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setTransient(boolean);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setTvSeriesItemType(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setType(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setVideoHeight(int);
-    method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setVideoWidth(int);
     method public androidx.tvprovider.media.tv.WatchNextProgram.Builder! setWatchNextType(int);
   }
 
diff --git a/versionedparcelable/api/1.1.0-alpha02.txt b/versionedparcelable/api/1.1.0-alpha02.txt
index 25cea04..a53654a 100644
--- a/versionedparcelable/api/1.1.0-alpha02.txt
+++ b/versionedparcelable/api/1.1.0-alpha02.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.versionedparcelable {
 
   public class ParcelUtils {
diff --git a/versionedparcelable/api/current.txt b/versionedparcelable/api/current.txt
index 25cea04..a53654a 100644
--- a/versionedparcelable/api/current.txt
+++ b/versionedparcelable/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.versionedparcelable {
 
   public class ParcelUtils {
diff --git a/viewpager/api/1.1.0-alpha01.txt b/viewpager/api/1.1.0-alpha01.txt
index 4343e5d..50813a2 100644
--- a/viewpager/api/1.1.0-alpha01.txt
+++ b/viewpager/api/1.1.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.viewpager.widget {
 
   public abstract class PagerAdapter {
@@ -88,7 +88,7 @@
     field public static final int SCROLL_STATE_SETTLING = 2; // 0x2
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) @java.lang.annotation.Inherited public static @interface ViewPager.DecorView {
+  @java.lang.annotation.Inherited @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) public static @interface ViewPager.DecorView {
   }
 
   public static class ViewPager.LayoutParams extends android.view.ViewGroup.LayoutParams {
diff --git a/viewpager/api/current.txt b/viewpager/api/current.txt
index 4343e5d..50813a2 100644
--- a/viewpager/api/current.txt
+++ b/viewpager/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.viewpager.widget {
 
   public abstract class PagerAdapter {
@@ -88,7 +88,7 @@
     field public static final int SCROLL_STATE_SETTLING = 2; // 0x2
   }
 
-  @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) @java.lang.annotation.Inherited public static @interface ViewPager.DecorView {
+  @java.lang.annotation.Inherited @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.RUNTIME) @java.lang.annotation.Target(java.lang.annotation.ElementType.TYPE) public static @interface ViewPager.DecorView {
   }
 
   public static class ViewPager.LayoutParams extends android.view.ViewGroup.LayoutParams {
diff --git a/viewpager2/api/1.0.0-alpha01.txt b/viewpager2/api/1.0.0-alpha01.txt
index e7cd1bc..feb6f6c 100644
--- a/viewpager2/api/1.0.0-alpha01.txt
+++ b/viewpager2/api/1.0.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.viewpager2.adapter {
 
   public abstract class FragmentStateAdapter extends androidx.recyclerview.widget.RecyclerView.Adapter<androidx.viewpager2.adapter.FragmentViewHolder> implements androidx.viewpager2.adapter.StatefulAdapter {
diff --git a/viewpager2/api/current.txt b/viewpager2/api/current.txt
index e7cd1bc..feb6f6c 100644
--- a/viewpager2/api/current.txt
+++ b/viewpager2/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.viewpager2.adapter {
 
   public abstract class FragmentStateAdapter extends androidx.recyclerview.widget.RecyclerView.Adapter<androidx.viewpager2.adapter.FragmentViewHolder> implements androidx.viewpager2.adapter.StatefulAdapter {
diff --git a/wear/api/1.0.0.txt b/wear/api/1.0.0.txt
index 80ac820..6609d67 100644
--- a/wear/api/1.0.0.txt
+++ b/wear/api/1.0.0.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.wear.activity {
 
   public class ConfirmationActivity extends android.app.Activity {
@@ -19,14 +19,6 @@
   @Deprecated public final class AmbientMode extends android.app.Fragment {
     ctor @Deprecated public AmbientMode();
     method @Deprecated public static <T extends android.app.Activity> androidx.wear.ambient.AmbientMode.AmbientController! attachAmbientSupport(T!);
-    method @Deprecated public void dump(String!, java.io.FileDescriptor!, java.io.PrintWriter!, String[]!);
-    method @Deprecated @CallSuper public void onAttach(android.content.Context!);
-    method @Deprecated @CallSuper public void onCreate(android.os.Bundle!);
-    method @Deprecated @CallSuper public void onDestroy();
-    method @Deprecated @CallSuper public void onDetach();
-    method @Deprecated @CallSuper public void onPause();
-    method @Deprecated @CallSuper public void onResume();
-    method @Deprecated @CallSuper public void onStop();
     field @Deprecated public static final String EXTRA_BURN_IN_PROTECTION = "com.google.android.wearable.compat.extra.BURN_IN_PROTECTION";
     field @Deprecated public static final String EXTRA_LOWBIT_AMBIENT = "com.google.android.wearable.compat.extra.LOWBIT_AMBIENT";
     field @Deprecated public static final String FRAGMENT_TAG = "android.support.wearable.ambient.AmbientMode";
@@ -196,7 +188,12 @@
     ctor public SwipeDismissFrameLayout(android.content.Context!, android.util.AttributeSet!, int);
     ctor public SwipeDismissFrameLayout(android.content.Context!, android.util.AttributeSet!, int, int);
     method public void addCallback(androidx.wear.widget.SwipeDismissFrameLayout.Callback!);
+    method public float getDismissMinDragWidthRatio();
+    method public boolean isSwipeable();
     method public void removeCallback(androidx.wear.widget.SwipeDismissFrameLayout.Callback!);
+    method public void setDismissMinDragWidthRatio(float);
+    method public void setSwipeable(boolean);
+    field public static final float DEFAULT_DISMISS_DRAG_WIDTH_RATIO = 0.33f;
   }
 
   @UiThread public abstract static class SwipeDismissFrameLayout.Callback {
diff --git a/wear/api/current.txt b/wear/api/current.txt
index 80ac820..6609d67 100644
--- a/wear/api/current.txt
+++ b/wear/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.wear.activity {
 
   public class ConfirmationActivity extends android.app.Activity {
@@ -19,14 +19,6 @@
   @Deprecated public final class AmbientMode extends android.app.Fragment {
     ctor @Deprecated public AmbientMode();
     method @Deprecated public static <T extends android.app.Activity> androidx.wear.ambient.AmbientMode.AmbientController! attachAmbientSupport(T!);
-    method @Deprecated public void dump(String!, java.io.FileDescriptor!, java.io.PrintWriter!, String[]!);
-    method @Deprecated @CallSuper public void onAttach(android.content.Context!);
-    method @Deprecated @CallSuper public void onCreate(android.os.Bundle!);
-    method @Deprecated @CallSuper public void onDestroy();
-    method @Deprecated @CallSuper public void onDetach();
-    method @Deprecated @CallSuper public void onPause();
-    method @Deprecated @CallSuper public void onResume();
-    method @Deprecated @CallSuper public void onStop();
     field @Deprecated public static final String EXTRA_BURN_IN_PROTECTION = "com.google.android.wearable.compat.extra.BURN_IN_PROTECTION";
     field @Deprecated public static final String EXTRA_LOWBIT_AMBIENT = "com.google.android.wearable.compat.extra.LOWBIT_AMBIENT";
     field @Deprecated public static final String FRAGMENT_TAG = "android.support.wearable.ambient.AmbientMode";
@@ -196,7 +188,12 @@
     ctor public SwipeDismissFrameLayout(android.content.Context!, android.util.AttributeSet!, int);
     ctor public SwipeDismissFrameLayout(android.content.Context!, android.util.AttributeSet!, int, int);
     method public void addCallback(androidx.wear.widget.SwipeDismissFrameLayout.Callback!);
+    method public float getDismissMinDragWidthRatio();
+    method public boolean isSwipeable();
     method public void removeCallback(androidx.wear.widget.SwipeDismissFrameLayout.Callback!);
+    method public void setDismissMinDragWidthRatio(float);
+    method public void setSwipeable(boolean);
+    field public static final float DEFAULT_DISMISS_DRAG_WIDTH_RATIO = 0.33f;
   }
 
   @UiThread public abstract static class SwipeDismissFrameLayout.Callback {
diff --git a/webkit/api/1.1.0-alpha01.txt b/webkit/api/1.1.0-alpha01.txt
index f15040d..02555f4 100644
--- a/webkit/api/1.1.0-alpha01.txt
+++ b/webkit/api/1.1.0-alpha01.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.webkit {
 
   public abstract class SafeBrowsingResponseCompat {
@@ -100,9 +100,9 @@
 
   public class WebViewClientCompat extends android.webkit.WebViewClient {
     ctor public WebViewClientCompat();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @RequiresApi(23) public final void onReceivedError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceError);
+    method @RequiresApi(23) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final void onReceivedError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceError);
     method @RequiresApi(21) public void onReceivedError(android.webkit.WebView, android.webkit.WebResourceRequest, androidx.webkit.WebResourceErrorCompat);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @RequiresApi(27) public final void onSafeBrowsingHit(android.webkit.WebView, android.webkit.WebResourceRequest, int, android.webkit.SafeBrowsingResponse);
+    method @RequiresApi(27) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final void onSafeBrowsingHit(android.webkit.WebView, android.webkit.WebResourceRequest, int, android.webkit.SafeBrowsingResponse);
     method public void onSafeBrowsingHit(android.webkit.WebView, android.webkit.WebResourceRequest, int, androidx.webkit.SafeBrowsingResponseCompat);
   }
 
diff --git a/webkit/api/current.txt b/webkit/api/current.txt
index f15040d..02555f4 100644
--- a/webkit/api/current.txt
+++ b/webkit/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.webkit {
 
   public abstract class SafeBrowsingResponseCompat {
@@ -100,9 +100,9 @@
 
   public class WebViewClientCompat extends android.webkit.WebViewClient {
     ctor public WebViewClientCompat();
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @RequiresApi(23) public final void onReceivedError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceError);
+    method @RequiresApi(23) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final void onReceivedError(android.webkit.WebView, android.webkit.WebResourceRequest, android.webkit.WebResourceError);
     method @RequiresApi(21) public void onReceivedError(android.webkit.WebView, android.webkit.WebResourceRequest, androidx.webkit.WebResourceErrorCompat);
-    method @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) @RequiresApi(27) public final void onSafeBrowsingHit(android.webkit.WebView, android.webkit.WebResourceRequest, int, android.webkit.SafeBrowsingResponse);
+    method @RequiresApi(27) @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP) public final void onSafeBrowsingHit(android.webkit.WebView, android.webkit.WebResourceRequest, int, android.webkit.SafeBrowsingResponse);
     method public void onSafeBrowsingHit(android.webkit.WebView, android.webkit.WebResourceRequest, int, androidx.webkit.SafeBrowsingResponseCompat);
   }
 
diff --git a/work/workmanager-ktx/api/1.0.0-beta03.txt b/work/workmanager-ktx/api/1.0.0-beta03.txt
index 81076cb..d76133a 100644
--- a/work/workmanager-ktx/api/1.0.0-beta03.txt
+++ b/work/workmanager-ktx/api/1.0.0-beta03.txt
@@ -1,9 +1,9 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.work {
 
   public abstract class CoroutineWorker extends androidx.work.ListenableWorker {
     ctor public CoroutineWorker(android.content.Context appContext, androidx.work.WorkerParameters params);
-    method public abstract Object? doWork(kotlin.coroutines.experimental.Continuation<? super androidx.work.ListenableWorker.Result> p);
+    method public abstract suspend Object? doWork(kotlin.coroutines.experimental.Continuation<? super androidx.work.ListenableWorker.Result> p);
     method public kotlinx.coroutines.CoroutineDispatcher getCoroutineContext();
     method public final void onStopped();
     method public final com.google.common.util.concurrent.ListenableFuture<androidx.work.ListenableWorker.Result> startWork();
@@ -12,7 +12,7 @@
 
   public final class DataKt {
     ctor public DataKt();
-    method public static androidx.work.Data workDataOf(kotlin.Pair<java.lang.String,?>... pairs);
+    method public static inline androidx.work.Data workDataOf(kotlin.Pair<java.lang.String,?>... pairs);
   }
 
   public final class ListenableFutureKt {
@@ -21,15 +21,21 @@
 
   public final class OneTimeWorkRequestKt {
     ctor public OneTimeWorkRequestKt();
-    method public static androidx.work.OneTimeWorkRequest.Builder setInputMerger(androidx.work.OneTimeWorkRequest.Builder, kotlin.reflect.KClass<? extends androidx.work.InputMerger> inputMerger);
+    method public static inline <reified W extends androidx.work.ListenableWorker> androidx.work.OneTimeWorkRequest.Builder! OneTimeWorkRequestBuilder();
+    method public static inline androidx.work.OneTimeWorkRequest.Builder setInputMerger(androidx.work.OneTimeWorkRequest.Builder, kotlin.reflect.KClass<? extends androidx.work.InputMerger> inputMerger);
   }
 
   public final class OperationKt {
     ctor public OperationKt();
+    method public static suspend inline Object! await(androidx.work.Operation, kotlin.coroutines.experimental.Continuation<? super androidx.work.Operation.State.SUCCESS>! p);
   }
 
   public final class PeriodicWorkRequestKt {
     ctor public PeriodicWorkRequestKt();
+    method public static inline <reified W extends androidx.work.ListenableWorker> androidx.work.PeriodicWorkRequest.Builder! PeriodicWorkRequestBuilder(long repeatInterval, java.util.concurrent.TimeUnit! repeatIntervalTimeUnit);
+    method @RequiresApi(26) public static inline <reified W extends androidx.work.ListenableWorker> androidx.work.PeriodicWorkRequest.Builder! PeriodicWorkRequestBuilder(java.time.Duration! repeatInterval);
+    method public static inline <reified W extends androidx.work.ListenableWorker> androidx.work.PeriodicWorkRequest.Builder! PeriodicWorkRequestBuilder(long repeatInterval, java.util.concurrent.TimeUnit! repeatIntervalTimeUnit, long flexTimeInterval, java.util.concurrent.TimeUnit! flexTimeIntervalUnit);
+    method @RequiresApi(26) public static inline <reified W extends androidx.work.ListenableWorker> androidx.work.PeriodicWorkRequest.Builder! PeriodicWorkRequestBuilder(java.time.Duration! repeatInterval, java.time.Duration! flexTimeInterval);
   }
 
 }
diff --git a/work/workmanager-ktx/api/1.0.0-beta04.txt b/work/workmanager-ktx/api/1.0.0-beta04.txt
index 81076cb..d76133a 100644
--- a/work/workmanager-ktx/api/1.0.0-beta04.txt
+++ b/work/workmanager-ktx/api/1.0.0-beta04.txt
@@ -1,9 +1,9 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.work {
 
   public abstract class CoroutineWorker extends androidx.work.ListenableWorker {
     ctor public CoroutineWorker(android.content.Context appContext, androidx.work.WorkerParameters params);
-    method public abstract Object? doWork(kotlin.coroutines.experimental.Continuation<? super androidx.work.ListenableWorker.Result> p);
+    method public abstract suspend Object? doWork(kotlin.coroutines.experimental.Continuation<? super androidx.work.ListenableWorker.Result> p);
     method public kotlinx.coroutines.CoroutineDispatcher getCoroutineContext();
     method public final void onStopped();
     method public final com.google.common.util.concurrent.ListenableFuture<androidx.work.ListenableWorker.Result> startWork();
@@ -12,7 +12,7 @@
 
   public final class DataKt {
     ctor public DataKt();
-    method public static androidx.work.Data workDataOf(kotlin.Pair<java.lang.String,?>... pairs);
+    method public static inline androidx.work.Data workDataOf(kotlin.Pair<java.lang.String,?>... pairs);
   }
 
   public final class ListenableFutureKt {
@@ -21,15 +21,21 @@
 
   public final class OneTimeWorkRequestKt {
     ctor public OneTimeWorkRequestKt();
-    method public static androidx.work.OneTimeWorkRequest.Builder setInputMerger(androidx.work.OneTimeWorkRequest.Builder, kotlin.reflect.KClass<? extends androidx.work.InputMerger> inputMerger);
+    method public static inline <reified W extends androidx.work.ListenableWorker> androidx.work.OneTimeWorkRequest.Builder! OneTimeWorkRequestBuilder();
+    method public static inline androidx.work.OneTimeWorkRequest.Builder setInputMerger(androidx.work.OneTimeWorkRequest.Builder, kotlin.reflect.KClass<? extends androidx.work.InputMerger> inputMerger);
   }
 
   public final class OperationKt {
     ctor public OperationKt();
+    method public static suspend inline Object! await(androidx.work.Operation, kotlin.coroutines.experimental.Continuation<? super androidx.work.Operation.State.SUCCESS>! p);
   }
 
   public final class PeriodicWorkRequestKt {
     ctor public PeriodicWorkRequestKt();
+    method public static inline <reified W extends androidx.work.ListenableWorker> androidx.work.PeriodicWorkRequest.Builder! PeriodicWorkRequestBuilder(long repeatInterval, java.util.concurrent.TimeUnit! repeatIntervalTimeUnit);
+    method @RequiresApi(26) public static inline <reified W extends androidx.work.ListenableWorker> androidx.work.PeriodicWorkRequest.Builder! PeriodicWorkRequestBuilder(java.time.Duration! repeatInterval);
+    method public static inline <reified W extends androidx.work.ListenableWorker> androidx.work.PeriodicWorkRequest.Builder! PeriodicWorkRequestBuilder(long repeatInterval, java.util.concurrent.TimeUnit! repeatIntervalTimeUnit, long flexTimeInterval, java.util.concurrent.TimeUnit! flexTimeIntervalUnit);
+    method @RequiresApi(26) public static inline <reified W extends androidx.work.ListenableWorker> androidx.work.PeriodicWorkRequest.Builder! PeriodicWorkRequestBuilder(java.time.Duration! repeatInterval, java.time.Duration! flexTimeInterval);
   }
 
 }
diff --git a/work/workmanager-ktx/api/current.txt b/work/workmanager-ktx/api/current.txt
index 81076cb..d76133a 100644
--- a/work/workmanager-ktx/api/current.txt
+++ b/work/workmanager-ktx/api/current.txt
@@ -1,9 +1,9 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.work {
 
   public abstract class CoroutineWorker extends androidx.work.ListenableWorker {
     ctor public CoroutineWorker(android.content.Context appContext, androidx.work.WorkerParameters params);
-    method public abstract Object? doWork(kotlin.coroutines.experimental.Continuation<? super androidx.work.ListenableWorker.Result> p);
+    method public abstract suspend Object? doWork(kotlin.coroutines.experimental.Continuation<? super androidx.work.ListenableWorker.Result> p);
     method public kotlinx.coroutines.CoroutineDispatcher getCoroutineContext();
     method public final void onStopped();
     method public final com.google.common.util.concurrent.ListenableFuture<androidx.work.ListenableWorker.Result> startWork();
@@ -12,7 +12,7 @@
 
   public final class DataKt {
     ctor public DataKt();
-    method public static androidx.work.Data workDataOf(kotlin.Pair<java.lang.String,?>... pairs);
+    method public static inline androidx.work.Data workDataOf(kotlin.Pair<java.lang.String,?>... pairs);
   }
 
   public final class ListenableFutureKt {
@@ -21,15 +21,21 @@
 
   public final class OneTimeWorkRequestKt {
     ctor public OneTimeWorkRequestKt();
-    method public static androidx.work.OneTimeWorkRequest.Builder setInputMerger(androidx.work.OneTimeWorkRequest.Builder, kotlin.reflect.KClass<? extends androidx.work.InputMerger> inputMerger);
+    method public static inline <reified W extends androidx.work.ListenableWorker> androidx.work.OneTimeWorkRequest.Builder! OneTimeWorkRequestBuilder();
+    method public static inline androidx.work.OneTimeWorkRequest.Builder setInputMerger(androidx.work.OneTimeWorkRequest.Builder, kotlin.reflect.KClass<? extends androidx.work.InputMerger> inputMerger);
   }
 
   public final class OperationKt {
     ctor public OperationKt();
+    method public static suspend inline Object! await(androidx.work.Operation, kotlin.coroutines.experimental.Continuation<? super androidx.work.Operation.State.SUCCESS>! p);
   }
 
   public final class PeriodicWorkRequestKt {
     ctor public PeriodicWorkRequestKt();
+    method public static inline <reified W extends androidx.work.ListenableWorker> androidx.work.PeriodicWorkRequest.Builder! PeriodicWorkRequestBuilder(long repeatInterval, java.util.concurrent.TimeUnit! repeatIntervalTimeUnit);
+    method @RequiresApi(26) public static inline <reified W extends androidx.work.ListenableWorker> androidx.work.PeriodicWorkRequest.Builder! PeriodicWorkRequestBuilder(java.time.Duration! repeatInterval);
+    method public static inline <reified W extends androidx.work.ListenableWorker> androidx.work.PeriodicWorkRequest.Builder! PeriodicWorkRequestBuilder(long repeatInterval, java.util.concurrent.TimeUnit! repeatIntervalTimeUnit, long flexTimeInterval, java.util.concurrent.TimeUnit! flexTimeIntervalUnit);
+    method @RequiresApi(26) public static inline <reified W extends androidx.work.ListenableWorker> androidx.work.PeriodicWorkRequest.Builder! PeriodicWorkRequestBuilder(java.time.Duration! repeatInterval, java.time.Duration! flexTimeInterval);
   }
 
 }
diff --git a/work/workmanager-rxjava2/api/1.0.0-beta03.txt b/work/workmanager-rxjava2/api/1.0.0-beta03.txt
index b727350..fc1c405 100644
--- a/work/workmanager-rxjava2/api/1.0.0-beta03.txt
+++ b/work/workmanager-rxjava2/api/1.0.0-beta03.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.work {
 
   public abstract class RxWorker extends androidx.work.ListenableWorker {
diff --git a/work/workmanager-rxjava2/api/1.0.0-beta04.txt b/work/workmanager-rxjava2/api/1.0.0-beta04.txt
index b727350..fc1c405 100644
--- a/work/workmanager-rxjava2/api/1.0.0-beta04.txt
+++ b/work/workmanager-rxjava2/api/1.0.0-beta04.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.work {
 
   public abstract class RxWorker extends androidx.work.ListenableWorker {
diff --git a/work/workmanager-rxjava2/api/current.txt b/work/workmanager-rxjava2/api/current.txt
index b727350..fc1c405 100644
--- a/work/workmanager-rxjava2/api/current.txt
+++ b/work/workmanager-rxjava2/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.work {
 
   public abstract class RxWorker extends androidx.work.ListenableWorker {
diff --git a/work/workmanager-testing/api/1.0.0-beta03.txt b/work/workmanager-testing/api/1.0.0-beta03.txt
index 5645c13..4754b0d 100644
--- a/work/workmanager-testing/api/1.0.0-beta03.txt
+++ b/work/workmanager-testing/api/1.0.0-beta03.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.work.testing {
 
   public class SynchronousExecutor implements java.util.concurrent.Executor {
diff --git a/work/workmanager-testing/api/1.0.0-beta04.txt b/work/workmanager-testing/api/1.0.0-beta04.txt
index 5645c13..4754b0d 100644
--- a/work/workmanager-testing/api/1.0.0-beta04.txt
+++ b/work/workmanager-testing/api/1.0.0-beta04.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.work.testing {
 
   public class SynchronousExecutor implements java.util.concurrent.Executor {
diff --git a/work/workmanager-testing/api/current.txt b/work/workmanager-testing/api/current.txt
index 5645c13..4754b0d 100644
--- a/work/workmanager-testing/api/current.txt
+++ b/work/workmanager-testing/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.work.testing {
 
   public class SynchronousExecutor implements java.util.concurrent.Executor {
diff --git a/work/workmanager/api/1.0.0-beta03.txt b/work/workmanager/api/1.0.0-beta03.txt
index 9be7492..bc7e240 100644
--- a/work/workmanager/api/1.0.0-beta03.txt
+++ b/work/workmanager/api/1.0.0-beta03.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.work {
 
   public final class ArrayCreatingInputMerger extends androidx.work.InputMerger {
@@ -204,7 +204,7 @@
     method public java.util.Set<java.lang.String> getTags();
   }
 
-  public static enum WorkInfo.State {
+  public enum WorkInfo.State {
     method public boolean isFinished();
     enum_constant public static final androidx.work.WorkInfo.State BLOCKED;
     enum_constant public static final androidx.work.WorkInfo.State CANCELLED;
diff --git a/work/workmanager/api/1.0.0-beta04.txt b/work/workmanager/api/1.0.0-beta04.txt
index 9be7492..bc7e240 100644
--- a/work/workmanager/api/1.0.0-beta04.txt
+++ b/work/workmanager/api/1.0.0-beta04.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.work {
 
   public final class ArrayCreatingInputMerger extends androidx.work.InputMerger {
@@ -204,7 +204,7 @@
     method public java.util.Set<java.lang.String> getTags();
   }
 
-  public static enum WorkInfo.State {
+  public enum WorkInfo.State {
     method public boolean isFinished();
     enum_constant public static final androidx.work.WorkInfo.State BLOCKED;
     enum_constant public static final androidx.work.WorkInfo.State CANCELLED;
diff --git a/work/workmanager/api/current.txt b/work/workmanager/api/current.txt
index 9be7492..bc7e240 100644
--- a/work/workmanager/api/current.txt
+++ b/work/workmanager/api/current.txt
@@ -1,4 +1,4 @@
-// Signature format: 2.0
+// Signature format: 3.0
 package androidx.work {
 
   public final class ArrayCreatingInputMerger extends androidx.work.InputMerger {
@@ -204,7 +204,7 @@
     method public java.util.Set<java.lang.String> getTags();
   }
 
-  public static enum WorkInfo.State {
+  public enum WorkInfo.State {
     method public boolean isFinished();
     enum_constant public static final androidx.work.WorkInfo.State BLOCKED;
     enum_constant public static final androidx.work.WorkInfo.State CANCELLED;