Update to a new version of Metalava

Biggest changes in metalava are:
- Starting to track valueOf and values methods for enums
- Infer nullability for static final fields that have
  a concrete non null value set to it.

This change also suppresses reflection warning from java
that is caused by Intellij core reflecting into java.util.ResourceBundle

Test: ./gradlew updateApi
Change-Id: Ifdacf217cefc0d470fc204e8257eab3873e9b0b0
diff --git a/activity/activity/api/api_lint.ignore b/activity/activity/api/api_lint.ignore
index d22641b..2784aac 100644
--- a/activity/activity/api/api_lint.ignore
+++ b/activity/activity/api/api_lint.ignore
@@ -3,10 +3,6 @@
     ComponentActivity should not extend `Activity`. Activity subclasses are impossible to compose. Expose a composable API instead.
 
 
-KotlinOperator: androidx.activity.result.ActivityResultRegistry#invoke(int, androidx.activity.result.contract.ActivityResultContract<I,O>, I, androidx.core.app.ActivityOptionsCompat):
-    Method can be invoked with function call syntax from Kotlin: `invoke` (this is usually desirable; just make sure it makes sense for this type of object)
-
-
 MissingNullability: androidx.activity.ComponentActivity#startActivityForResult(android.content.Intent, int) parameter #0:
     Missing nullability on parameter `intent` in method `startActivityForResult`
 MissingNullability: androidx.activity.ComponentActivity#startActivityForResult(android.content.Intent, int, android.os.Bundle) parameter #0:
diff --git a/annotation/annotation-experimental/api/1.1.0-alpha01.txt b/annotation/annotation-experimental/api/1.1.0-alpha01.txt
index c4e699b..e854aa6 100644
--- a/annotation/annotation-experimental/api/1.1.0-alpha01.txt
+++ b/annotation/annotation-experimental/api/1.1.0-alpha01.txt
@@ -6,6 +6,8 @@
   }
 
   public enum Experimental.Level {
+    method public static androidx.annotation.experimental.Experimental.Level valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.annotation.experimental.Experimental.Level[] values();
     enum_constant public static final androidx.annotation.experimental.Experimental.Level ERROR;
     enum_constant public static final androidx.annotation.experimental.Experimental.Level WARNING;
   }
diff --git a/annotation/annotation-experimental/api/current.txt b/annotation/annotation-experimental/api/current.txt
index c4e699b..e854aa6 100644
--- a/annotation/annotation-experimental/api/current.txt
+++ b/annotation/annotation-experimental/api/current.txt
@@ -6,6 +6,8 @@
   }
 
   public enum Experimental.Level {
+    method public static androidx.annotation.experimental.Experimental.Level valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.annotation.experimental.Experimental.Level[] values();
     enum_constant public static final androidx.annotation.experimental.Experimental.Level ERROR;
     enum_constant public static final androidx.annotation.experimental.Experimental.Level WARNING;
   }
diff --git a/annotation/annotation-experimental/api/public_plus_experimental_1.1.0-alpha01.txt b/annotation/annotation-experimental/api/public_plus_experimental_1.1.0-alpha01.txt
index c4e699b..e854aa6 100644
--- a/annotation/annotation-experimental/api/public_plus_experimental_1.1.0-alpha01.txt
+++ b/annotation/annotation-experimental/api/public_plus_experimental_1.1.0-alpha01.txt
@@ -6,6 +6,8 @@
   }
 
   public enum Experimental.Level {
+    method public static androidx.annotation.experimental.Experimental.Level valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.annotation.experimental.Experimental.Level[] values();
     enum_constant public static final androidx.annotation.experimental.Experimental.Level ERROR;
     enum_constant public static final androidx.annotation.experimental.Experimental.Level WARNING;
   }
diff --git a/annotation/annotation-experimental/api/public_plus_experimental_current.txt b/annotation/annotation-experimental/api/public_plus_experimental_current.txt
index c4e699b..e854aa6 100644
--- a/annotation/annotation-experimental/api/public_plus_experimental_current.txt
+++ b/annotation/annotation-experimental/api/public_plus_experimental_current.txt
@@ -6,6 +6,8 @@
   }
 
   public enum Experimental.Level {
+    method public static androidx.annotation.experimental.Experimental.Level valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.annotation.experimental.Experimental.Level[] values();
     enum_constant public static final androidx.annotation.experimental.Experimental.Level ERROR;
     enum_constant public static final androidx.annotation.experimental.Experimental.Level WARNING;
   }
diff --git a/annotation/annotation-experimental/api/restricted_1.1.0-alpha01.txt b/annotation/annotation-experimental/api/restricted_1.1.0-alpha01.txt
index c4e699b..e854aa6 100644
--- a/annotation/annotation-experimental/api/restricted_1.1.0-alpha01.txt
+++ b/annotation/annotation-experimental/api/restricted_1.1.0-alpha01.txt
@@ -6,6 +6,8 @@
   }
 
   public enum Experimental.Level {
+    method public static androidx.annotation.experimental.Experimental.Level valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.annotation.experimental.Experimental.Level[] values();
     enum_constant public static final androidx.annotation.experimental.Experimental.Level ERROR;
     enum_constant public static final androidx.annotation.experimental.Experimental.Level WARNING;
   }
diff --git a/annotation/annotation-experimental/api/restricted_current.txt b/annotation/annotation-experimental/api/restricted_current.txt
index c4e699b..e854aa6 100644
--- a/annotation/annotation-experimental/api/restricted_current.txt
+++ b/annotation/annotation-experimental/api/restricted_current.txt
@@ -6,6 +6,8 @@
   }
 
   public enum Experimental.Level {
+    method public static androidx.annotation.experimental.Experimental.Level valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.annotation.experimental.Experimental.Level[] values();
     enum_constant public static final androidx.annotation.experimental.Experimental.Level ERROR;
     enum_constant public static final androidx.annotation.experimental.Experimental.Level WARNING;
   }
diff --git a/appcompat/appcompat/api/1.3.0-alpha01.txt b/appcompat/appcompat/api/1.3.0-alpha01.txt
index dc3c5ab..89aae44 100644
--- a/appcompat/appcompat/api/1.3.0-alpha01.txt
+++ b/appcompat/appcompat/api/1.3.0-alpha01.txt
@@ -449,11 +449,11 @@
     ctor public ActionMenuView.LayoutParams(android.view.ViewGroup.LayoutParams!);
     ctor public ActionMenuView.LayoutParams(androidx.appcompat.widget.ActionMenuView.LayoutParams!);
     ctor public ActionMenuView.LayoutParams(int, int);
-    field @android.view.ViewDebug.ExportedProperty public int cellsUsed;
-    field @android.view.ViewDebug.ExportedProperty public boolean expandable;
-    field @android.view.ViewDebug.ExportedProperty public int extraPixels;
-    field @android.view.ViewDebug.ExportedProperty public boolean isOverflowButton;
-    field @android.view.ViewDebug.ExportedProperty public boolean preventEdgeOffset;
+    field public int cellsUsed;
+    field public boolean expandable;
+    field public int extraPixels;
+    field public boolean isOverflowButton;
+    field public boolean preventEdgeOffset;
   }
 
   public static interface ActionMenuView.OnMenuItemClickListener {
diff --git a/appcompat/appcompat/api/api_lint.ignore b/appcompat/appcompat/api/api_lint.ignore
index fd01b04..edddedd 100644
--- a/appcompat/appcompat/api/api_lint.ignore
+++ b/appcompat/appcompat/api/api_lint.ignore
@@ -613,8 +613,6 @@
     Missing nullability on method `onCreateInputConnection` return
 MissingNullability: androidx.appcompat.widget.AppCompatAutoCompleteTextView#onCreateInputConnection(android.view.inputmethod.EditorInfo) parameter #0:
     Missing nullability on parameter `outAttrs` in method `onCreateInputConnection`
-MissingNullability: androidx.appcompat.widget.AppCompatAutoCompleteTextView#setBackgroundDrawable(android.graphics.drawable.Drawable) parameter #0:
-    Missing nullability on parameter `background` in method `setBackgroundDrawable`
 MissingNullability: androidx.appcompat.widget.AppCompatAutoCompleteTextView#setCustomSelectionActionModeCallback(android.view.ActionMode.Callback) parameter #0:
     Missing nullability on parameter `actionModeCallback` in method `setCustomSelectionActionModeCallback`
 MissingNullability: androidx.appcompat.widget.AppCompatAutoCompleteTextView#setTextAppearance(android.content.Context, int) parameter #0:
@@ -625,14 +623,10 @@
     Missing nullability on parameter `info` in method `onInitializeAccessibilityNodeInfo`
 MissingNullability: androidx.appcompat.widget.AppCompatButton#onTextChanged(CharSequence, int, int, int) parameter #0:
     Missing nullability on parameter `text` in method `onTextChanged`
-MissingNullability: androidx.appcompat.widget.AppCompatButton#setBackgroundDrawable(android.graphics.drawable.Drawable) parameter #0:
-    Missing nullability on parameter `background` in method `setBackgroundDrawable`
 MissingNullability: androidx.appcompat.widget.AppCompatButton#setCustomSelectionActionModeCallback(android.view.ActionMode.Callback) parameter #0:
     Missing nullability on parameter `actionModeCallback` in method `setCustomSelectionActionModeCallback`
 MissingNullability: androidx.appcompat.widget.AppCompatButton#setTextAppearance(android.content.Context, int) parameter #0:
     Missing nullability on parameter `context` in method `setTextAppearance`
-MissingNullability: androidx.appcompat.widget.AppCompatCheckBox#setBackgroundDrawable(android.graphics.drawable.Drawable) parameter #0:
-    Missing nullability on parameter `background` in method `setBackgroundDrawable`
 MissingNullability: androidx.appcompat.widget.AppCompatCheckBox#setButtonDrawable(android.graphics.drawable.Drawable) parameter #0:
     Missing nullability on parameter `buttonDrawable` in method `setButtonDrawable`
 MissingNullability: androidx.appcompat.widget.AppCompatCheckedTextView#onCreateInputConnection(android.view.inputmethod.EditorInfo):
@@ -647,26 +641,18 @@
     Missing nullability on method `onCreateInputConnection` return
 MissingNullability: androidx.appcompat.widget.AppCompatEditText#onCreateInputConnection(android.view.inputmethod.EditorInfo) parameter #0:
     Missing nullability on parameter `outAttrs` in method `onCreateInputConnection`
-MissingNullability: androidx.appcompat.widget.AppCompatEditText#setBackgroundDrawable(android.graphics.drawable.Drawable) parameter #0:
-    Missing nullability on parameter `background` in method `setBackgroundDrawable`
 MissingNullability: androidx.appcompat.widget.AppCompatEditText#setCustomSelectionActionModeCallback(android.view.ActionMode.Callback) parameter #0:
     Missing nullability on parameter `actionModeCallback` in method `setCustomSelectionActionModeCallback`
 MissingNullability: androidx.appcompat.widget.AppCompatEditText#setTextAppearance(android.content.Context, int) parameter #0:
     Missing nullability on parameter `context` in method `setTextAppearance`
-MissingNullability: androidx.appcompat.widget.AppCompatImageButton#setBackgroundDrawable(android.graphics.drawable.Drawable) parameter #0:
-    Missing nullability on parameter `background` in method `setBackgroundDrawable`
 MissingNullability: androidx.appcompat.widget.AppCompatImageButton#setImageBitmap(android.graphics.Bitmap) parameter #0:
     Missing nullability on parameter `bm` in method `setImageBitmap`
-MissingNullability: androidx.appcompat.widget.AppCompatImageView#setBackgroundDrawable(android.graphics.drawable.Drawable) parameter #0:
-    Missing nullability on parameter `background` in method `setBackgroundDrawable`
 MissingNullability: androidx.appcompat.widget.AppCompatImageView#setImageBitmap(android.graphics.Bitmap) parameter #0:
     Missing nullability on parameter `bm` in method `setImageBitmap`
 MissingNullability: androidx.appcompat.widget.AppCompatMultiAutoCompleteTextView#onCreateInputConnection(android.view.inputmethod.EditorInfo):
     Missing nullability on method `onCreateInputConnection` return
 MissingNullability: androidx.appcompat.widget.AppCompatMultiAutoCompleteTextView#onCreateInputConnection(android.view.inputmethod.EditorInfo) parameter #0:
     Missing nullability on parameter `outAttrs` in method `onCreateInputConnection`
-MissingNullability: androidx.appcompat.widget.AppCompatMultiAutoCompleteTextView#setBackgroundDrawable(android.graphics.drawable.Drawable) parameter #0:
-    Missing nullability on parameter `background` in method `setBackgroundDrawable`
 MissingNullability: androidx.appcompat.widget.AppCompatMultiAutoCompleteTextView#setTextAppearance(android.content.Context, int) parameter #0:
     Missing nullability on parameter `context` in method `setTextAppearance`
 MissingNullability: androidx.appcompat.widget.AppCompatRadioButton#AppCompatRadioButton(android.content.Context) parameter #0:
@@ -675,8 +661,6 @@
     Missing nullability on parameter `context` in method `AppCompatRadioButton`
 MissingNullability: androidx.appcompat.widget.AppCompatRadioButton#AppCompatRadioButton(android.content.Context, android.util.AttributeSet, int) parameter #0:
     Missing nullability on parameter `context` in method `AppCompatRadioButton`
-MissingNullability: androidx.appcompat.widget.AppCompatRadioButton#setBackgroundDrawable(android.graphics.drawable.Drawable) parameter #0:
-    Missing nullability on parameter `background` in method `setBackgroundDrawable`
 MissingNullability: androidx.appcompat.widget.AppCompatRadioButton#setButtonDrawable(android.graphics.drawable.Drawable) parameter #0:
     Missing nullability on parameter `buttonDrawable` in method `setButtonDrawable`
 MissingNullability: androidx.appcompat.widget.AppCompatSeekBar#onDraw(android.graphics.Canvas) parameter #0:
@@ -697,8 +681,6 @@
     Missing nullability on parameter `event` in method `onTouchEvent`
 MissingNullability: androidx.appcompat.widget.AppCompatSpinner#setAdapter(android.widget.SpinnerAdapter) parameter #0:
     Missing nullability on parameter `adapter` in method `setAdapter`
-MissingNullability: androidx.appcompat.widget.AppCompatSpinner#setBackgroundDrawable(android.graphics.drawable.Drawable) parameter #0:
-    Missing nullability on parameter `background` in method `setBackgroundDrawable`
 MissingNullability: androidx.appcompat.widget.AppCompatSpinner#setPopupBackgroundDrawable(android.graphics.drawable.Drawable) parameter #0:
     Missing nullability on parameter `background` in method `setPopupBackgroundDrawable`
 MissingNullability: androidx.appcompat.widget.AppCompatSpinner#setPrompt(CharSequence) parameter #0:
@@ -711,8 +693,6 @@
     Missing nullability on parameter `outAttrs` in method `onCreateInputConnection`
 MissingNullability: androidx.appcompat.widget.AppCompatTextView#onTextChanged(CharSequence, int, int, int) parameter #0:
     Missing nullability on parameter `text` in method `onTextChanged`
-MissingNullability: androidx.appcompat.widget.AppCompatTextView#setBackgroundDrawable(android.graphics.drawable.Drawable) parameter #0:
-    Missing nullability on parameter `background` in method `setBackgroundDrawable`
 MissingNullability: androidx.appcompat.widget.AppCompatTextView#setCustomSelectionActionModeCallback(android.view.ActionMode.Callback) parameter #0:
     Missing nullability on parameter `actionModeCallback` in method `setCustomSelectionActionModeCallback`
 MissingNullability: androidx.appcompat.widget.AppCompatTextView#setTextAppearance(android.content.Context, int) parameter #0:
diff --git a/appcompat/appcompat/api/current.txt b/appcompat/appcompat/api/current.txt
index dc3c5ab..89aae44 100644
--- a/appcompat/appcompat/api/current.txt
+++ b/appcompat/appcompat/api/current.txt
@@ -449,11 +449,11 @@
     ctor public ActionMenuView.LayoutParams(android.view.ViewGroup.LayoutParams!);
     ctor public ActionMenuView.LayoutParams(androidx.appcompat.widget.ActionMenuView.LayoutParams!);
     ctor public ActionMenuView.LayoutParams(int, int);
-    field @android.view.ViewDebug.ExportedProperty public int cellsUsed;
-    field @android.view.ViewDebug.ExportedProperty public boolean expandable;
-    field @android.view.ViewDebug.ExportedProperty public int extraPixels;
-    field @android.view.ViewDebug.ExportedProperty public boolean isOverflowButton;
-    field @android.view.ViewDebug.ExportedProperty public boolean preventEdgeOffset;
+    field public int cellsUsed;
+    field public boolean expandable;
+    field public int extraPixels;
+    field public boolean isOverflowButton;
+    field public boolean preventEdgeOffset;
   }
 
   public static interface ActionMenuView.OnMenuItemClickListener {
diff --git a/appcompat/appcompat/api/public_plus_experimental_1.3.0-alpha01.txt b/appcompat/appcompat/api/public_plus_experimental_1.3.0-alpha01.txt
index 09e7731..dca14b8 100644
--- a/appcompat/appcompat/api/public_plus_experimental_1.3.0-alpha01.txt
+++ b/appcompat/appcompat/api/public_plus_experimental_1.3.0-alpha01.txt
@@ -449,11 +449,11 @@
     ctor public ActionMenuView.LayoutParams(android.view.ViewGroup.LayoutParams!);
     ctor public ActionMenuView.LayoutParams(androidx.appcompat.widget.ActionMenuView.LayoutParams!);
     ctor public ActionMenuView.LayoutParams(int, int);
-    field @android.view.ViewDebug.ExportedProperty public int cellsUsed;
-    field @android.view.ViewDebug.ExportedProperty public boolean expandable;
-    field @android.view.ViewDebug.ExportedProperty public int extraPixels;
-    field @android.view.ViewDebug.ExportedProperty public boolean isOverflowButton;
-    field @android.view.ViewDebug.ExportedProperty public boolean preventEdgeOffset;
+    field public int cellsUsed;
+    field public boolean expandable;
+    field public int extraPixels;
+    field public boolean isOverflowButton;
+    field public boolean preventEdgeOffset;
   }
 
   public static interface ActionMenuView.OnMenuItemClickListener {
diff --git a/appcompat/appcompat/api/public_plus_experimental_current.txt b/appcompat/appcompat/api/public_plus_experimental_current.txt
index 09e7731..dca14b8 100644
--- a/appcompat/appcompat/api/public_plus_experimental_current.txt
+++ b/appcompat/appcompat/api/public_plus_experimental_current.txt
@@ -449,11 +449,11 @@
     ctor public ActionMenuView.LayoutParams(android.view.ViewGroup.LayoutParams!);
     ctor public ActionMenuView.LayoutParams(androidx.appcompat.widget.ActionMenuView.LayoutParams!);
     ctor public ActionMenuView.LayoutParams(int, int);
-    field @android.view.ViewDebug.ExportedProperty public int cellsUsed;
-    field @android.view.ViewDebug.ExportedProperty public boolean expandable;
-    field @android.view.ViewDebug.ExportedProperty public int extraPixels;
-    field @android.view.ViewDebug.ExportedProperty public boolean isOverflowButton;
-    field @android.view.ViewDebug.ExportedProperty public boolean preventEdgeOffset;
+    field public int cellsUsed;
+    field public boolean expandable;
+    field public int extraPixels;
+    field public boolean isOverflowButton;
+    field public boolean preventEdgeOffset;
   }
 
   public static interface ActionMenuView.OnMenuItemClickListener {
diff --git a/appcompat/appcompat/api/restricted_1.3.0-alpha01.txt b/appcompat/appcompat/api/restricted_1.3.0-alpha01.txt
index 6f63cec..a210c6c 100644
--- a/appcompat/appcompat/api/restricted_1.3.0-alpha01.txt
+++ b/appcompat/appcompat/api/restricted_1.3.0-alpha01.txt
@@ -936,14 +936,14 @@
     method public int getGroupId();
     method public android.graphics.drawable.Drawable! getIcon();
     method public android.content.Intent! getIntent();
-    method @android.view.ViewDebug.CapturedViewProperty public int getItemId();
+    method public int getItemId();
     method public android.view.ContextMenu.ContextMenuInfo! getMenuInfo();
     method public char getNumericShortcut();
     method public int getOrder();
     method public int getOrdering();
     method public android.view.SubMenu! getSubMenu();
     method public androidx.core.view.ActionProvider! getSupportActionProvider();
-    method @android.view.ViewDebug.CapturedViewProperty public CharSequence! getTitle();
+    method public CharSequence! getTitle();
     method public CharSequence! getTitleCondensed();
     method public boolean hasCollapsibleActionView();
     method public boolean hasSubMenu();
@@ -1295,11 +1295,11 @@
     ctor public ActionMenuView.LayoutParams(android.view.ViewGroup.LayoutParams!);
     ctor public ActionMenuView.LayoutParams(androidx.appcompat.widget.ActionMenuView.LayoutParams!);
     ctor public ActionMenuView.LayoutParams(int, int);
-    field @android.view.ViewDebug.ExportedProperty public int cellsUsed;
-    field @android.view.ViewDebug.ExportedProperty public boolean expandable;
-    field @android.view.ViewDebug.ExportedProperty public int extraPixels;
-    field @android.view.ViewDebug.ExportedProperty public boolean isOverflowButton;
-    field @android.view.ViewDebug.ExportedProperty public boolean preventEdgeOffset;
+    field public int cellsUsed;
+    field public boolean expandable;
+    field public int extraPixels;
+    field public boolean isOverflowButton;
+    field public boolean preventEdgeOffset;
   }
 
   public static interface ActionMenuView.OnMenuItemClickListener {
diff --git a/appcompat/appcompat/api/restricted_current.txt b/appcompat/appcompat/api/restricted_current.txt
index 6f63cec..a210c6c 100644
--- a/appcompat/appcompat/api/restricted_current.txt
+++ b/appcompat/appcompat/api/restricted_current.txt
@@ -936,14 +936,14 @@
     method public int getGroupId();
     method public android.graphics.drawable.Drawable! getIcon();
     method public android.content.Intent! getIntent();
-    method @android.view.ViewDebug.CapturedViewProperty public int getItemId();
+    method public int getItemId();
     method public android.view.ContextMenu.ContextMenuInfo! getMenuInfo();
     method public char getNumericShortcut();
     method public int getOrder();
     method public int getOrdering();
     method public android.view.SubMenu! getSubMenu();
     method public androidx.core.view.ActionProvider! getSupportActionProvider();
-    method @android.view.ViewDebug.CapturedViewProperty public CharSequence! getTitle();
+    method public CharSequence! getTitle();
     method public CharSequence! getTitleCondensed();
     method public boolean hasCollapsibleActionView();
     method public boolean hasSubMenu();
@@ -1295,11 +1295,11 @@
     ctor public ActionMenuView.LayoutParams(android.view.ViewGroup.LayoutParams!);
     ctor public ActionMenuView.LayoutParams(androidx.appcompat.widget.ActionMenuView.LayoutParams!);
     ctor public ActionMenuView.LayoutParams(int, int);
-    field @android.view.ViewDebug.ExportedProperty public int cellsUsed;
-    field @android.view.ViewDebug.ExportedProperty public boolean expandable;
-    field @android.view.ViewDebug.ExportedProperty public int extraPixels;
-    field @android.view.ViewDebug.ExportedProperty public boolean isOverflowButton;
-    field @android.view.ViewDebug.ExportedProperty public boolean preventEdgeOffset;
+    field public int cellsUsed;
+    field public boolean expandable;
+    field public int extraPixels;
+    field public boolean isOverflowButton;
+    field public boolean preventEdgeOffset;
   }
 
   public static interface ActionMenuView.OnMenuItemClickListener {
diff --git a/benchmark/common/api/1.1.0-alpha01.txt b/benchmark/common/api/1.1.0-alpha01.txt
index 291b7b8..4f7ae83 100644
--- a/benchmark/common/api/1.1.0-alpha01.txt
+++ b/benchmark/common/api/1.1.0-alpha01.txt
@@ -8,7 +8,7 @@
     method public boolean keepRunning();
     method public void pauseTiming();
     method public void resumeTiming();
-    field public static final androidx.benchmark.BenchmarkState.Companion! Companion;
+    field public static final androidx.benchmark.BenchmarkState.Companion Companion;
   }
 
   public static final class BenchmarkState.Companion {
diff --git a/benchmark/common/api/current.txt b/benchmark/common/api/current.txt
index 291b7b8..4f7ae83 100644
--- a/benchmark/common/api/current.txt
+++ b/benchmark/common/api/current.txt
@@ -8,7 +8,7 @@
     method public boolean keepRunning();
     method public void pauseTiming();
     method public void resumeTiming();
-    field public static final androidx.benchmark.BenchmarkState.Companion! Companion;
+    field public static final androidx.benchmark.BenchmarkState.Companion Companion;
   }
 
   public static final class BenchmarkState.Companion {
diff --git a/benchmark/common/api/public_plus_experimental_1.1.0-alpha01.txt b/benchmark/common/api/public_plus_experimental_1.1.0-alpha01.txt
index 4aaaeed..80824a4 100644
--- a/benchmark/common/api/public_plus_experimental_1.1.0-alpha01.txt
+++ b/benchmark/common/api/public_plus_experimental_1.1.0-alpha01.txt
@@ -11,7 +11,7 @@
     method public void pauseTiming();
     method @androidx.benchmark.BenchmarkState.Companion.ExperimentalExternalReport public static void reportData(String className, String testName, @IntRange(from=0) long totalRunTimeNs, java.util.List<java.lang.Long> dataNs, @IntRange(from=0) int warmupIterations, @IntRange(from=0) long thermalThrottleSleepSeconds, @IntRange(from=1) int repeatIterations);
     method public void resumeTiming();
-    field public static final androidx.benchmark.BenchmarkState.Companion! Companion;
+    field public static final androidx.benchmark.BenchmarkState.Companion Companion;
   }
 
   public static final class BenchmarkState.Companion {
diff --git a/benchmark/common/api/public_plus_experimental_current.txt b/benchmark/common/api/public_plus_experimental_current.txt
index 4aaaeed..80824a4 100644
--- a/benchmark/common/api/public_plus_experimental_current.txt
+++ b/benchmark/common/api/public_plus_experimental_current.txt
@@ -11,7 +11,7 @@
     method public void pauseTiming();
     method @androidx.benchmark.BenchmarkState.Companion.ExperimentalExternalReport public static void reportData(String className, String testName, @IntRange(from=0) long totalRunTimeNs, java.util.List<java.lang.Long> dataNs, @IntRange(from=0) int warmupIterations, @IntRange(from=0) long thermalThrottleSleepSeconds, @IntRange(from=1) int repeatIterations);
     method public void resumeTiming();
-    field public static final androidx.benchmark.BenchmarkState.Companion! Companion;
+    field public static final androidx.benchmark.BenchmarkState.Companion Companion;
   }
 
   public static final class BenchmarkState.Companion {
diff --git a/benchmark/common/api/restricted_1.1.0-alpha01.txt b/benchmark/common/api/restricted_1.1.0-alpha01.txt
index a91c3dc..c39c72d3 100644
--- a/benchmark/common/api/restricted_1.1.0-alpha01.txt
+++ b/benchmark/common/api/restricted_1.1.0-alpha01.txt
@@ -9,7 +9,7 @@
     method @kotlin.PublishedApi internal boolean keepRunningInternal();
     method public void pauseTiming();
     method public void resumeTiming();
-    field public static final androidx.benchmark.BenchmarkState.Companion! Companion;
+    field public static final androidx.benchmark.BenchmarkState.Companion Companion;
     field @kotlin.PublishedApi internal int iterationsRemaining;
   }
 
diff --git a/benchmark/common/api/restricted_current.txt b/benchmark/common/api/restricted_current.txt
index a91c3dc..c39c72d3 100644
--- a/benchmark/common/api/restricted_current.txt
+++ b/benchmark/common/api/restricted_current.txt
@@ -9,7 +9,7 @@
     method @kotlin.PublishedApi internal boolean keepRunningInternal();
     method public void pauseTiming();
     method public void resumeTiming();
-    field public static final androidx.benchmark.BenchmarkState.Companion! Companion;
+    field public static final androidx.benchmark.BenchmarkState.Companion Companion;
     field @kotlin.PublishedApi internal int iterationsRemaining;
   }
 
diff --git a/browser/browser/api/api_lint.ignore b/browser/browser/api/api_lint.ignore
index a4d5f5e..0a088b5 100644
--- a/browser/browser/api/api_lint.ignore
+++ b/browser/browser/api/api_lint.ignore
@@ -57,8 +57,6 @@
     Must avoid boxed primitives (`java.lang.Integer`)
 
 
-BuilderSetStyle: androidx.browser.customtabs.CustomTabsIntent.Builder#enableUrlBarHiding():
-    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.browser.customtabs.CustomTabsIntent.Builder.enableUrlBarHiding()
 BuilderSetStyle: androidx.browser.trusted.TrustedWebActivityIntentBuilder#buildCustomTabsIntent():
     Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.browser.trusted.TrustedWebActivityIntentBuilder.buildCustomTabsIntent()
 
@@ -79,7 +77,7 @@
     Listeners should always be at end of argument list (method `newSession`)
 
 
-OptionalBuilderConstructorAgrument: androidx.browser.customtabs.CustomTabsIntent.Builder#Builder(androidx.browser.customtabs.CustomTabsSession) parameter #0:
+OptionalBuilderConstructorArgument: androidx.browser.customtabs.CustomTabsIntent.Builder#Builder(androidx.browser.customtabs.CustomTabsSession) parameter #0:
     Builder constructor arguments must be mandatory (i.e. not @Nullable): parameter session in androidx.browser.customtabs.CustomTabsIntent.Builder(androidx.browser.customtabs.CustomTabsSession session)
 
 
diff --git a/buildSrc/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt b/buildSrc/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt
index a1bc83d..a022a62 100644
--- a/buildSrc/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt
+++ b/buildSrc/src/main/kotlin/androidx/build/metalava/MetalavaRunner.kt
@@ -64,6 +64,11 @@
         val metalavaJar = getParameters().getMetalavaClasspath().get()
 
         execOperations.javaexec {
+            // Intellij core reflects into java.util.ResourceBundle
+            it.jvmArgs = listOf(
+                "--add-opens",
+                "java.base/java.util=ALL-UNNAMED"
+            )
             it.classpath(metalavaJar)
             it.main = "com.android.tools.metalava.Driver"
             it.args = allArgs
diff --git a/compose/compose-dispatch/api/0.1.0-dev15.txt b/compose/compose-dispatch/api/0.1.0-dev15.txt
index da8a09e..ecb0640 100644
--- a/compose/compose-dispatch/api/0.1.0-dev15.txt
+++ b/compose/compose-dispatch/api/0.1.0-dev15.txt
@@ -6,7 +6,7 @@
     method public android.view.Choreographer getChoreographer();
     method public androidx.compose.dispatch.MonotonicFrameClock getFrameClock();
     property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
-    field public static final androidx.compose.dispatch.AndroidUiDispatcher.Companion! Companion;
+    field public static final androidx.compose.dispatch.AndroidUiDispatcher.Companion Companion;
   }
 
   public static final class AndroidUiDispatcher.Companion {
diff --git a/compose/compose-dispatch/api/current.txt b/compose/compose-dispatch/api/current.txt
index da8a09e..ecb0640 100644
--- a/compose/compose-dispatch/api/current.txt
+++ b/compose/compose-dispatch/api/current.txt
@@ -6,7 +6,7 @@
     method public android.view.Choreographer getChoreographer();
     method public androidx.compose.dispatch.MonotonicFrameClock getFrameClock();
     property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
-    field public static final androidx.compose.dispatch.AndroidUiDispatcher.Companion! Companion;
+    field public static final androidx.compose.dispatch.AndroidUiDispatcher.Companion Companion;
   }
 
   public static final class AndroidUiDispatcher.Companion {
diff --git a/compose/compose-dispatch/api/public_plus_experimental_0.1.0-dev15.txt b/compose/compose-dispatch/api/public_plus_experimental_0.1.0-dev15.txt
index da8a09e..ecb0640 100644
--- a/compose/compose-dispatch/api/public_plus_experimental_0.1.0-dev15.txt
+++ b/compose/compose-dispatch/api/public_plus_experimental_0.1.0-dev15.txt
@@ -6,7 +6,7 @@
     method public android.view.Choreographer getChoreographer();
     method public androidx.compose.dispatch.MonotonicFrameClock getFrameClock();
     property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
-    field public static final androidx.compose.dispatch.AndroidUiDispatcher.Companion! Companion;
+    field public static final androidx.compose.dispatch.AndroidUiDispatcher.Companion Companion;
   }
 
   public static final class AndroidUiDispatcher.Companion {
diff --git a/compose/compose-dispatch/api/public_plus_experimental_current.txt b/compose/compose-dispatch/api/public_plus_experimental_current.txt
index da8a09e..ecb0640 100644
--- a/compose/compose-dispatch/api/public_plus_experimental_current.txt
+++ b/compose/compose-dispatch/api/public_plus_experimental_current.txt
@@ -6,7 +6,7 @@
     method public android.view.Choreographer getChoreographer();
     method public androidx.compose.dispatch.MonotonicFrameClock getFrameClock();
     property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
-    field public static final androidx.compose.dispatch.AndroidUiDispatcher.Companion! Companion;
+    field public static final androidx.compose.dispatch.AndroidUiDispatcher.Companion Companion;
   }
 
   public static final class AndroidUiDispatcher.Companion {
diff --git a/compose/compose-dispatch/api/restricted_0.1.0-dev15.txt b/compose/compose-dispatch/api/restricted_0.1.0-dev15.txt
index da8a09e..ecb0640 100644
--- a/compose/compose-dispatch/api/restricted_0.1.0-dev15.txt
+++ b/compose/compose-dispatch/api/restricted_0.1.0-dev15.txt
@@ -6,7 +6,7 @@
     method public android.view.Choreographer getChoreographer();
     method public androidx.compose.dispatch.MonotonicFrameClock getFrameClock();
     property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
-    field public static final androidx.compose.dispatch.AndroidUiDispatcher.Companion! Companion;
+    field public static final androidx.compose.dispatch.AndroidUiDispatcher.Companion Companion;
   }
 
   public static final class AndroidUiDispatcher.Companion {
diff --git a/compose/compose-dispatch/api/restricted_current.txt b/compose/compose-dispatch/api/restricted_current.txt
index da8a09e..ecb0640 100644
--- a/compose/compose-dispatch/api/restricted_current.txt
+++ b/compose/compose-dispatch/api/restricted_current.txt
@@ -6,7 +6,7 @@
     method public android.view.Choreographer getChoreographer();
     method public androidx.compose.dispatch.MonotonicFrameClock getFrameClock();
     property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
-    field public static final androidx.compose.dispatch.AndroidUiDispatcher.Companion! Companion;
+    field public static final androidx.compose.dispatch.AndroidUiDispatcher.Companion Companion;
   }
 
   public static final class AndroidUiDispatcher.Companion {
diff --git a/compose/compose-runtime/api/0.1.0-dev15.txt b/compose/compose-runtime/api/0.1.0-dev15.txt
index 668b060..80cbcbf 100644
--- a/compose/compose-runtime/api/0.1.0-dev15.txt
+++ b/compose/compose-runtime/api/0.1.0-dev15.txt
@@ -220,7 +220,7 @@
     method @org.jetbrains.annotations.TestOnly public <T> T! isolated(kotlin.jvm.functions.Function0<? extends T> block);
     method public void nextFrame();
     method @org.jetbrains.annotations.TestOnly public <T> T! unframed(kotlin.jvm.functions.Function0<? extends T> block);
-    field public static final androidx.compose.FrameManager! INSTANCE;
+    field public static final androidx.compose.FrameManager INSTANCE;
   }
 
   @androidx.compose.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.CLASS) public @interface Immutable {
@@ -275,7 +275,7 @@
   @Deprecated public final class NullCompilationScope {
     method @Deprecated public kotlin.Unit getComposer();
     property public final kotlin.Unit composer;
-    field @Deprecated public static final androidx.compose.NullCompilationScope! INSTANCE;
+    field @Deprecated public static final androidx.compose.NullCompilationScope INSTANCE;
   }
 
   public final class ObserveKt {
@@ -316,7 +316,7 @@
     method public suspend Object? recomposeAndApplyChanges(kotlinx.coroutines.CoroutineScope applyCoroutineScope, androidx.compose.dispatch.MonotonicFrameClock frameClock, long frameCount, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
     method public suspend Object? runRecomposeAndApplyChanges(androidx.compose.dispatch.MonotonicFrameClock frameClock, kotlin.coroutines.Continuation<?> p);
     property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
-    field public static final androidx.compose.Recomposer.Companion! Companion;
+    field public static final androidx.compose.Recomposer.Companion Companion;
   }
 
   public static final class Recomposer.Companion {
@@ -409,7 +409,7 @@
     method @androidx.compose.InternalComposeApi @org.jetbrains.annotations.TestOnly public void verifyWellFormed();
     method @androidx.compose.InternalComposeApi public <T> T! write(kotlin.jvm.functions.Function1<? super androidx.compose.SlotWriter,? extends T> block);
     property public final int size;
-    field public static final androidx.compose.SlotTable.Companion! Companion;
+    field public static final androidx.compose.SlotTable.Companion Companion;
   }
 
   @androidx.compose.InternalComposeApi public static final class SlotTable.Companion {
diff --git a/compose/compose-runtime/api/api_lint.ignore b/compose/compose-runtime/api/api_lint.ignore
index 215da53..bd61dc8 100644
--- a/compose/compose-runtime/api/api_lint.ignore
+++ b/compose/compose-runtime/api/api_lint.ignore
@@ -41,10 +41,6 @@
     Exceptions must be named `FooException`, was `FrameAborted`
 
 
-KotlinOperator: androidx.compose.ComposerUpdater#set(V, kotlin.jvm.functions.Function2<? super T,? super V,? extends kotlin.Unit>):
-    Note that adding the `operator` keyword would allow calling this method using operator syntax
-KotlinOperator: androidx.compose.ComposerUpdater#set(int, kotlin.jvm.functions.Function2<? super T,? super java.lang.Integer,kotlin.Unit>):
-    Note that adding the `operator` keyword would allow calling this method using operator syntax
 KotlinOperator: androidx.compose.SlotReader#get(androidx.compose.Anchor):
     Note that adding the `operator` keyword would allow calling this method using operator syntax
 KotlinOperator: androidx.compose.SlotReader#get(int):
@@ -53,6 +49,10 @@
     Note that adding the `operator` keyword would allow calling this method using operator syntax
 KotlinOperator: androidx.compose.SlotWriter#get(int):
     Note that adding the `operator` keyword would allow calling this method using operator syntax
+KotlinOperator: androidx.compose.Updater#set(V, kotlin.jvm.functions.Function2<? super T,? super V,? extends kotlin.Unit>):
+    Note that adding the `operator` keyword would allow calling this method using operator syntax
+KotlinOperator: androidx.compose.Updater#set(int, kotlin.jvm.functions.Function2<? super T,? super java.lang.Integer,kotlin.Unit>):
+    Note that adding the `operator` keyword would allow calling this method using operator syntax
 
 
 MissingNullability: androidx.compose.BuildableMap#containsKey(Object) parameter #0:
@@ -76,6 +76,7 @@
 NoByteOrShort: androidx.compose.Composer#changed(short) parameter #0:
     Should avoid odd sized primitives; use `int` instead of `short` in parameter value in androidx.compose.Composer.changed(short value)
 
+
 NotCloseable: androidx.compose.SlotReader:
     Classes that release resources (close()) should implement AutoClosable and CloseGuard: class androidx.compose.SlotReader
 NotCloseable: androidx.compose.SlotWriter:
diff --git a/compose/compose-runtime/api/current.txt b/compose/compose-runtime/api/current.txt
index 668b060..80cbcbf 100644
--- a/compose/compose-runtime/api/current.txt
+++ b/compose/compose-runtime/api/current.txt
@@ -220,7 +220,7 @@
     method @org.jetbrains.annotations.TestOnly public <T> T! isolated(kotlin.jvm.functions.Function0<? extends T> block);
     method public void nextFrame();
     method @org.jetbrains.annotations.TestOnly public <T> T! unframed(kotlin.jvm.functions.Function0<? extends T> block);
-    field public static final androidx.compose.FrameManager! INSTANCE;
+    field public static final androidx.compose.FrameManager INSTANCE;
   }
 
   @androidx.compose.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.CLASS) public @interface Immutable {
@@ -275,7 +275,7 @@
   @Deprecated public final class NullCompilationScope {
     method @Deprecated public kotlin.Unit getComposer();
     property public final kotlin.Unit composer;
-    field @Deprecated public static final androidx.compose.NullCompilationScope! INSTANCE;
+    field @Deprecated public static final androidx.compose.NullCompilationScope INSTANCE;
   }
 
   public final class ObserveKt {
@@ -316,7 +316,7 @@
     method public suspend Object? recomposeAndApplyChanges(kotlinx.coroutines.CoroutineScope applyCoroutineScope, androidx.compose.dispatch.MonotonicFrameClock frameClock, long frameCount, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
     method public suspend Object? runRecomposeAndApplyChanges(androidx.compose.dispatch.MonotonicFrameClock frameClock, kotlin.coroutines.Continuation<?> p);
     property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
-    field public static final androidx.compose.Recomposer.Companion! Companion;
+    field public static final androidx.compose.Recomposer.Companion Companion;
   }
 
   public static final class Recomposer.Companion {
@@ -409,7 +409,7 @@
     method @androidx.compose.InternalComposeApi @org.jetbrains.annotations.TestOnly public void verifyWellFormed();
     method @androidx.compose.InternalComposeApi public <T> T! write(kotlin.jvm.functions.Function1<? super androidx.compose.SlotWriter,? extends T> block);
     property public final int size;
-    field public static final androidx.compose.SlotTable.Companion! Companion;
+    field public static final androidx.compose.SlotTable.Companion Companion;
   }
 
   @androidx.compose.InternalComposeApi public static final class SlotTable.Companion {
diff --git a/compose/compose-runtime/api/public_plus_experimental_0.1.0-dev15.txt b/compose/compose-runtime/api/public_plus_experimental_0.1.0-dev15.txt
index 668b060..80cbcbf 100644
--- a/compose/compose-runtime/api/public_plus_experimental_0.1.0-dev15.txt
+++ b/compose/compose-runtime/api/public_plus_experimental_0.1.0-dev15.txt
@@ -220,7 +220,7 @@
     method @org.jetbrains.annotations.TestOnly public <T> T! isolated(kotlin.jvm.functions.Function0<? extends T> block);
     method public void nextFrame();
     method @org.jetbrains.annotations.TestOnly public <T> T! unframed(kotlin.jvm.functions.Function0<? extends T> block);
-    field public static final androidx.compose.FrameManager! INSTANCE;
+    field public static final androidx.compose.FrameManager INSTANCE;
   }
 
   @androidx.compose.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.CLASS) public @interface Immutable {
@@ -275,7 +275,7 @@
   @Deprecated public final class NullCompilationScope {
     method @Deprecated public kotlin.Unit getComposer();
     property public final kotlin.Unit composer;
-    field @Deprecated public static final androidx.compose.NullCompilationScope! INSTANCE;
+    field @Deprecated public static final androidx.compose.NullCompilationScope INSTANCE;
   }
 
   public final class ObserveKt {
@@ -316,7 +316,7 @@
     method public suspend Object? recomposeAndApplyChanges(kotlinx.coroutines.CoroutineScope applyCoroutineScope, androidx.compose.dispatch.MonotonicFrameClock frameClock, long frameCount, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
     method public suspend Object? runRecomposeAndApplyChanges(androidx.compose.dispatch.MonotonicFrameClock frameClock, kotlin.coroutines.Continuation<?> p);
     property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
-    field public static final androidx.compose.Recomposer.Companion! Companion;
+    field public static final androidx.compose.Recomposer.Companion Companion;
   }
 
   public static final class Recomposer.Companion {
@@ -409,7 +409,7 @@
     method @androidx.compose.InternalComposeApi @org.jetbrains.annotations.TestOnly public void verifyWellFormed();
     method @androidx.compose.InternalComposeApi public <T> T! write(kotlin.jvm.functions.Function1<? super androidx.compose.SlotWriter,? extends T> block);
     property public final int size;
-    field public static final androidx.compose.SlotTable.Companion! Companion;
+    field public static final androidx.compose.SlotTable.Companion Companion;
   }
 
   @androidx.compose.InternalComposeApi public static final class SlotTable.Companion {
diff --git a/compose/compose-runtime/api/public_plus_experimental_current.txt b/compose/compose-runtime/api/public_plus_experimental_current.txt
index 668b060..80cbcbf 100644
--- a/compose/compose-runtime/api/public_plus_experimental_current.txt
+++ b/compose/compose-runtime/api/public_plus_experimental_current.txt
@@ -220,7 +220,7 @@
     method @org.jetbrains.annotations.TestOnly public <T> T! isolated(kotlin.jvm.functions.Function0<? extends T> block);
     method public void nextFrame();
     method @org.jetbrains.annotations.TestOnly public <T> T! unframed(kotlin.jvm.functions.Function0<? extends T> block);
-    field public static final androidx.compose.FrameManager! INSTANCE;
+    field public static final androidx.compose.FrameManager INSTANCE;
   }
 
   @androidx.compose.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.CLASS) public @interface Immutable {
@@ -275,7 +275,7 @@
   @Deprecated public final class NullCompilationScope {
     method @Deprecated public kotlin.Unit getComposer();
     property public final kotlin.Unit composer;
-    field @Deprecated public static final androidx.compose.NullCompilationScope! INSTANCE;
+    field @Deprecated public static final androidx.compose.NullCompilationScope INSTANCE;
   }
 
   public final class ObserveKt {
@@ -316,7 +316,7 @@
     method public suspend Object? recomposeAndApplyChanges(kotlinx.coroutines.CoroutineScope applyCoroutineScope, androidx.compose.dispatch.MonotonicFrameClock frameClock, long frameCount, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
     method public suspend Object? runRecomposeAndApplyChanges(androidx.compose.dispatch.MonotonicFrameClock frameClock, kotlin.coroutines.Continuation<?> p);
     property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
-    field public static final androidx.compose.Recomposer.Companion! Companion;
+    field public static final androidx.compose.Recomposer.Companion Companion;
   }
 
   public static final class Recomposer.Companion {
@@ -409,7 +409,7 @@
     method @androidx.compose.InternalComposeApi @org.jetbrains.annotations.TestOnly public void verifyWellFormed();
     method @androidx.compose.InternalComposeApi public <T> T! write(kotlin.jvm.functions.Function1<? super androidx.compose.SlotWriter,? extends T> block);
     property public final int size;
-    field public static final androidx.compose.SlotTable.Companion! Companion;
+    field public static final androidx.compose.SlotTable.Companion Companion;
   }
 
   @androidx.compose.InternalComposeApi public static final class SlotTable.Companion {
diff --git a/compose/compose-runtime/api/restricted_0.1.0-dev15.txt b/compose/compose-runtime/api/restricted_0.1.0-dev15.txt
index 49f5841..56ae171 100644
--- a/compose/compose-runtime/api/restricted_0.1.0-dev15.txt
+++ b/compose/compose-runtime/api/restricted_0.1.0-dev15.txt
@@ -235,7 +235,7 @@
     method @org.jetbrains.annotations.TestOnly public <T> T! isolated(kotlin.jvm.functions.Function0<? extends T> block);
     method public void nextFrame();
     method @org.jetbrains.annotations.TestOnly public <T> T! unframed(kotlin.jvm.functions.Function0<? extends T> block);
-    field public static final androidx.compose.FrameManager! INSTANCE;
+    field public static final androidx.compose.FrameManager INSTANCE;
   }
 
   @androidx.compose.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.CLASS) public @interface Immutable {
@@ -290,7 +290,7 @@
   @Deprecated public final class NullCompilationScope {
     method @Deprecated public kotlin.Unit getComposer();
     property public final kotlin.Unit composer;
-    field @Deprecated public static final androidx.compose.NullCompilationScope! INSTANCE;
+    field @Deprecated public static final androidx.compose.NullCompilationScope INSTANCE;
   }
 
   public final class ObserveKt {
@@ -346,7 +346,7 @@
     method public suspend Object? recomposeAndApplyChanges(kotlinx.coroutines.CoroutineScope applyCoroutineScope, androidx.compose.dispatch.MonotonicFrameClock frameClock, long frameCount, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
     method public suspend Object? runRecomposeAndApplyChanges(androidx.compose.dispatch.MonotonicFrameClock frameClock, kotlin.coroutines.Continuation<?> p);
     property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
-    field public static final androidx.compose.Recomposer.Companion! Companion;
+    field public static final androidx.compose.Recomposer.Companion Companion;
   }
 
   public static final class Recomposer.Companion {
@@ -439,7 +439,7 @@
     method @androidx.compose.InternalComposeApi @org.jetbrains.annotations.TestOnly public void verifyWellFormed();
     method @androidx.compose.InternalComposeApi public <T> T! write(kotlin.jvm.functions.Function1<? super androidx.compose.SlotWriter,? extends T> block);
     property public final int size;
-    field public static final androidx.compose.SlotTable.Companion! Companion;
+    field public static final androidx.compose.SlotTable.Companion Companion;
   }
 
   @androidx.compose.InternalComposeApi public static final class SlotTable.Companion {
diff --git a/compose/compose-runtime/api/restricted_current.txt b/compose/compose-runtime/api/restricted_current.txt
index 49f5841..56ae171 100644
--- a/compose/compose-runtime/api/restricted_current.txt
+++ b/compose/compose-runtime/api/restricted_current.txt
@@ -235,7 +235,7 @@
     method @org.jetbrains.annotations.TestOnly public <T> T! isolated(kotlin.jvm.functions.Function0<? extends T> block);
     method public void nextFrame();
     method @org.jetbrains.annotations.TestOnly public <T> T! unframed(kotlin.jvm.functions.Function0<? extends T> block);
-    field public static final androidx.compose.FrameManager! INSTANCE;
+    field public static final androidx.compose.FrameManager INSTANCE;
   }
 
   @androidx.compose.StableMarker @kotlin.annotation.MustBeDocumented @kotlin.annotation.Retention(AnnotationRetention.BINARY) @kotlin.annotation.Target(allowedTargets=AnnotationTarget.CLASS) public @interface Immutable {
@@ -290,7 +290,7 @@
   @Deprecated public final class NullCompilationScope {
     method @Deprecated public kotlin.Unit getComposer();
     property public final kotlin.Unit composer;
-    field @Deprecated public static final androidx.compose.NullCompilationScope! INSTANCE;
+    field @Deprecated public static final androidx.compose.NullCompilationScope INSTANCE;
   }
 
   public final class ObserveKt {
@@ -346,7 +346,7 @@
     method public suspend Object? recomposeAndApplyChanges(kotlinx.coroutines.CoroutineScope applyCoroutineScope, androidx.compose.dispatch.MonotonicFrameClock frameClock, long frameCount, kotlin.coroutines.Continuation<? super kotlin.Unit> p);
     method public suspend Object? runRecomposeAndApplyChanges(androidx.compose.dispatch.MonotonicFrameClock frameClock, kotlin.coroutines.Continuation<?> p);
     property public final androidx.compose.dispatch.MonotonicFrameClock frameClock;
-    field public static final androidx.compose.Recomposer.Companion! Companion;
+    field public static final androidx.compose.Recomposer.Companion Companion;
   }
 
   public static final class Recomposer.Companion {
@@ -439,7 +439,7 @@
     method @androidx.compose.InternalComposeApi @org.jetbrains.annotations.TestOnly public void verifyWellFormed();
     method @androidx.compose.InternalComposeApi public <T> T! write(kotlin.jvm.functions.Function1<? super androidx.compose.SlotWriter,? extends T> block);
     property public final int size;
-    field public static final androidx.compose.SlotTable.Companion! Companion;
+    field public static final androidx.compose.SlotTable.Companion Companion;
   }
 
   @androidx.compose.InternalComposeApi public static final class SlotTable.Companion {
diff --git a/core/core/api/1.5.0-alpha01.txt b/core/core/api/1.5.0-alpha01.txt
index f80f458..e6df9f3 100644
--- a/core/core/api/1.5.0-alpha01.txt
+++ b/core/core/api/1.5.0-alpha01.txt
@@ -1708,10 +1708,10 @@
   }
 
   public final class PatternsCompat {
-    field public static final java.util.regex.Pattern! DOMAIN_NAME;
-    field public static final java.util.regex.Pattern! EMAIL_ADDRESS;
-    field public static final java.util.regex.Pattern! IP_ADDRESS;
-    field public static final java.util.regex.Pattern! WEB_URL;
+    field public static final java.util.regex.Pattern DOMAIN_NAME;
+    field public static final java.util.regex.Pattern EMAIL_ADDRESS;
+    field public static final java.util.regex.Pattern IP_ADDRESS;
+    field public static final java.util.regex.Pattern WEB_URL;
   }
 
   public final class Pools {
diff --git a/core/core/api/api_lint.ignore b/core/core/api/api_lint.ignore
index 46772b6..b6158f8d 100644
--- a/core/core/api/api_lint.ignore
+++ b/core/core/api/api_lint.ignore
@@ -1085,14 +1085,6 @@
     Missing nullability on field `LTR` in class `class androidx.core.text.TextDirectionHeuristicsCompat`
 MissingNullability: androidx.core.text.TextDirectionHeuristicsCompat#RTL:
     Missing nullability on field `RTL` in class `class androidx.core.text.TextDirectionHeuristicsCompat`
-MissingNullability: androidx.core.util.PatternsCompat#DOMAIN_NAME:
-    Missing nullability on field `DOMAIN_NAME` in class `class androidx.core.util.PatternsCompat`
-MissingNullability: androidx.core.util.PatternsCompat#EMAIL_ADDRESS:
-    Missing nullability on field `EMAIL_ADDRESS` in class `class androidx.core.util.PatternsCompat`
-MissingNullability: androidx.core.util.PatternsCompat#IP_ADDRESS:
-    Missing nullability on field `IP_ADDRESS` in class `class androidx.core.util.PatternsCompat`
-MissingNullability: androidx.core.util.PatternsCompat#WEB_URL:
-    Missing nullability on field `WEB_URL` in class `class androidx.core.util.PatternsCompat`
 MissingNullability: androidx.core.view.AccessibilityDelegateCompat#dispatchPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) parameter #0:
     Missing nullability on parameter `host` in method `dispatchPopulateAccessibilityEvent`
 MissingNullability: androidx.core.view.AccessibilityDelegateCompat#dispatchPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent) parameter #1:
@@ -2111,11 +2103,11 @@
     Provide an explicit copy constructor instead of implementing `clone()`
 
 
-OptionalBuilderConstructorAgrument: androidx.core.app.NotificationCompat.Action.Builder#Builder(androidx.core.graphics.drawable.IconCompat, CharSequence, android.app.PendingIntent) parameter #0:
+OptionalBuilderConstructorArgument: androidx.core.app.NotificationCompat.Action.Builder#Builder(androidx.core.graphics.drawable.IconCompat, CharSequence, android.app.PendingIntent) parameter #0:
     Builder constructor arguments must be mandatory (i.e. not @Nullable): parameter icon in androidx.core.app.NotificationCompat.Action.Builder(androidx.core.graphics.drawable.IconCompat icon, CharSequence title, android.app.PendingIntent intent)
-OptionalBuilderConstructorAgrument: androidx.core.app.NotificationCompat.Action.Builder#Builder(androidx.core.graphics.drawable.IconCompat, CharSequence, android.app.PendingIntent) parameter #1:
+OptionalBuilderConstructorArgument: androidx.core.app.NotificationCompat.Action.Builder#Builder(androidx.core.graphics.drawable.IconCompat, CharSequence, android.app.PendingIntent) parameter #1:
     Builder constructor arguments must be mandatory (i.e. not @Nullable): parameter title in androidx.core.app.NotificationCompat.Action.Builder(androidx.core.graphics.drawable.IconCompat icon, CharSequence title, android.app.PendingIntent intent)
-OptionalBuilderConstructorAgrument: androidx.core.app.NotificationCompat.Action.Builder#Builder(androidx.core.graphics.drawable.IconCompat, CharSequence, android.app.PendingIntent) parameter #2:
+OptionalBuilderConstructorArgument: androidx.core.app.NotificationCompat.Action.Builder#Builder(androidx.core.graphics.drawable.IconCompat, CharSequence, android.app.PendingIntent) parameter #2:
     Builder constructor arguments must be mandatory (i.e. not @Nullable): parameter intent in androidx.core.app.NotificationCompat.Action.Builder(androidx.core.graphics.drawable.IconCompat icon, CharSequence title, android.app.PendingIntent intent)
 
 
diff --git a/core/core/api/current.txt b/core/core/api/current.txt
index f80f458..e6df9f3 100644
--- a/core/core/api/current.txt
+++ b/core/core/api/current.txt
@@ -1708,10 +1708,10 @@
   }
 
   public final class PatternsCompat {
-    field public static final java.util.regex.Pattern! DOMAIN_NAME;
-    field public static final java.util.regex.Pattern! EMAIL_ADDRESS;
-    field public static final java.util.regex.Pattern! IP_ADDRESS;
-    field public static final java.util.regex.Pattern! WEB_URL;
+    field public static final java.util.regex.Pattern DOMAIN_NAME;
+    field public static final java.util.regex.Pattern EMAIL_ADDRESS;
+    field public static final java.util.regex.Pattern IP_ADDRESS;
+    field public static final java.util.regex.Pattern WEB_URL;
   }
 
   public final class Pools {
diff --git a/core/core/api/public_plus_experimental_1.5.0-alpha01.txt b/core/core/api/public_plus_experimental_1.5.0-alpha01.txt
index a9a4c2e..ce97204 100644
--- a/core/core/api/public_plus_experimental_1.5.0-alpha01.txt
+++ b/core/core/api/public_plus_experimental_1.5.0-alpha01.txt
@@ -1706,10 +1706,10 @@
   }
 
   public final class PatternsCompat {
-    field public static final java.util.regex.Pattern! DOMAIN_NAME;
-    field public static final java.util.regex.Pattern! EMAIL_ADDRESS;
-    field public static final java.util.regex.Pattern! IP_ADDRESS;
-    field public static final java.util.regex.Pattern! WEB_URL;
+    field public static final java.util.regex.Pattern DOMAIN_NAME;
+    field public static final java.util.regex.Pattern EMAIL_ADDRESS;
+    field public static final java.util.regex.Pattern IP_ADDRESS;
+    field public static final java.util.regex.Pattern WEB_URL;
   }
 
   public final class Pools {
diff --git a/core/core/api/public_plus_experimental_current.txt b/core/core/api/public_plus_experimental_current.txt
index a9a4c2e..ce97204 100644
--- a/core/core/api/public_plus_experimental_current.txt
+++ b/core/core/api/public_plus_experimental_current.txt
@@ -1706,10 +1706,10 @@
   }
 
   public final class PatternsCompat {
-    field public static final java.util.regex.Pattern! DOMAIN_NAME;
-    field public static final java.util.regex.Pattern! EMAIL_ADDRESS;
-    field public static final java.util.regex.Pattern! IP_ADDRESS;
-    field public static final java.util.regex.Pattern! WEB_URL;
+    field public static final java.util.regex.Pattern DOMAIN_NAME;
+    field public static final java.util.regex.Pattern EMAIL_ADDRESS;
+    field public static final java.util.regex.Pattern IP_ADDRESS;
+    field public static final java.util.regex.Pattern WEB_URL;
   }
 
   public final class Pools {
diff --git a/core/core/api/restricted_1.5.0-alpha01.txt b/core/core/api/restricted_1.5.0-alpha01.txt
index a3a2802..c1640ac 100644
--- a/core/core/api/restricted_1.5.0-alpha01.txt
+++ b/core/core/api/restricted_1.5.0-alpha01.txt
@@ -2051,12 +2051,12 @@
   }
 
   public final class PatternsCompat {
-    field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final java.util.regex.Pattern! AUTOLINK_EMAIL_ADDRESS;
-    field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final java.util.regex.Pattern! AUTOLINK_WEB_URL;
-    field public static final java.util.regex.Pattern! DOMAIN_NAME;
-    field public static final java.util.regex.Pattern! EMAIL_ADDRESS;
-    field public static final java.util.regex.Pattern! IP_ADDRESS;
-    field public static final java.util.regex.Pattern! WEB_URL;
+    field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final java.util.regex.Pattern AUTOLINK_EMAIL_ADDRESS;
+    field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final java.util.regex.Pattern AUTOLINK_WEB_URL;
+    field public static final java.util.regex.Pattern DOMAIN_NAME;
+    field public static final java.util.regex.Pattern EMAIL_ADDRESS;
+    field public static final java.util.regex.Pattern IP_ADDRESS;
+    field public static final java.util.regex.Pattern WEB_URL;
   }
 
   public final class Pools {
@@ -2878,7 +2878,7 @@
     method @Deprecated public androidx.core.view.WindowInsetsCompat replaceSystemWindowInsets(android.graphics.Rect);
     method @RequiresApi(20) public android.view.WindowInsets? toWindowInsets();
     method @RequiresApi(20) public static androidx.core.view.WindowInsetsCompat toWindowInsetsCompat(android.view.WindowInsets);
-    field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final androidx.core.view.WindowInsetsCompat! CONSUMED;
+    field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final androidx.core.view.WindowInsetsCompat CONSUMED;
   }
 
   public static final class WindowInsetsCompat.Builder {
diff --git a/core/core/api/restricted_current.txt b/core/core/api/restricted_current.txt
index a3a2802..c1640ac 100644
--- a/core/core/api/restricted_current.txt
+++ b/core/core/api/restricted_current.txt
@@ -2051,12 +2051,12 @@
   }
 
   public final class PatternsCompat {
-    field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final java.util.regex.Pattern! AUTOLINK_EMAIL_ADDRESS;
-    field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final java.util.regex.Pattern! AUTOLINK_WEB_URL;
-    field public static final java.util.regex.Pattern! DOMAIN_NAME;
-    field public static final java.util.regex.Pattern! EMAIL_ADDRESS;
-    field public static final java.util.regex.Pattern! IP_ADDRESS;
-    field public static final java.util.regex.Pattern! WEB_URL;
+    field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final java.util.regex.Pattern AUTOLINK_EMAIL_ADDRESS;
+    field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final java.util.regex.Pattern AUTOLINK_WEB_URL;
+    field public static final java.util.regex.Pattern DOMAIN_NAME;
+    field public static final java.util.regex.Pattern EMAIL_ADDRESS;
+    field public static final java.util.regex.Pattern IP_ADDRESS;
+    field public static final java.util.regex.Pattern WEB_URL;
   }
 
   public final class Pools {
@@ -2878,7 +2878,7 @@
     method @Deprecated public androidx.core.view.WindowInsetsCompat replaceSystemWindowInsets(android.graphics.Rect);
     method @RequiresApi(20) public android.view.WindowInsets? toWindowInsets();
     method @RequiresApi(20) public static androidx.core.view.WindowInsetsCompat toWindowInsetsCompat(android.view.WindowInsets);
-    field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final androidx.core.view.WindowInsetsCompat! CONSUMED;
+    field @RestrictTo(androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP_PREFIX) public static final androidx.core.view.WindowInsetsCompat CONSUMED;
   }
 
   public static final class WindowInsetsCompat.Builder {
diff --git a/datastore/datastore-preferences/api/1.0.0-alpha01.txt b/datastore/datastore-preferences/api/1.0.0-alpha01.txt
index 45ea06f..7d90845 100644
--- a/datastore/datastore-preferences/api/1.0.0-alpha01.txt
+++ b/datastore/datastore-preferences/api/1.0.0-alpha01.txt
@@ -19,7 +19,7 @@
     method public String getString(String key, String defaultValue);
     method public java.util.Set<java.lang.String> getStringSet(String key, java.util.Set<java.lang.String> defaultValue);
     method public androidx.datastore.preferences.Preferences.Builder toBuilder();
-    field public static final androidx.datastore.preferences.Preferences.Companion! Companion;
+    field public static final androidx.datastore.preferences.Preferences.Companion Companion;
   }
 
   public static final class Preferences.Builder {
@@ -41,7 +41,7 @@
 
   public final class SharedPreferencesMigration {
     method public static kotlin.jvm.functions.Function0<androidx.datastore.DataMigration<androidx.datastore.preferences.Preferences>> create(android.content.Context context, String sharedPreferencesName, java.util.Set<java.lang.String>? keysToMigrate = MIGRATE_ALL_KEYS, boolean deleteEmptyPreferences = true);
-    field public static final androidx.datastore.preferences.SharedPreferencesMigration.Companion! Companion;
+    field public static final androidx.datastore.preferences.SharedPreferencesMigration.Companion Companion;
   }
 
   public static final class SharedPreferencesMigration.Companion {
diff --git a/datastore/datastore-preferences/api/current.txt b/datastore/datastore-preferences/api/current.txt
index 45ea06f..7d90845 100644
--- a/datastore/datastore-preferences/api/current.txt
+++ b/datastore/datastore-preferences/api/current.txt
@@ -19,7 +19,7 @@
     method public String getString(String key, String defaultValue);
     method public java.util.Set<java.lang.String> getStringSet(String key, java.util.Set<java.lang.String> defaultValue);
     method public androidx.datastore.preferences.Preferences.Builder toBuilder();
-    field public static final androidx.datastore.preferences.Preferences.Companion! Companion;
+    field public static final androidx.datastore.preferences.Preferences.Companion Companion;
   }
 
   public static final class Preferences.Builder {
@@ -41,7 +41,7 @@
 
   public final class SharedPreferencesMigration {
     method public static kotlin.jvm.functions.Function0<androidx.datastore.DataMigration<androidx.datastore.preferences.Preferences>> create(android.content.Context context, String sharedPreferencesName, java.util.Set<java.lang.String>? keysToMigrate = MIGRATE_ALL_KEYS, boolean deleteEmptyPreferences = true);
-    field public static final androidx.datastore.preferences.SharedPreferencesMigration.Companion! Companion;
+    field public static final androidx.datastore.preferences.SharedPreferencesMigration.Companion Companion;
   }
 
   public static final class SharedPreferencesMigration.Companion {
diff --git a/datastore/datastore-preferences/api/public_plus_experimental_1.0.0-alpha01.txt b/datastore/datastore-preferences/api/public_plus_experimental_1.0.0-alpha01.txt
index 45ea06f..7d90845 100644
--- a/datastore/datastore-preferences/api/public_plus_experimental_1.0.0-alpha01.txt
+++ b/datastore/datastore-preferences/api/public_plus_experimental_1.0.0-alpha01.txt
@@ -19,7 +19,7 @@
     method public String getString(String key, String defaultValue);
     method public java.util.Set<java.lang.String> getStringSet(String key, java.util.Set<java.lang.String> defaultValue);
     method public androidx.datastore.preferences.Preferences.Builder toBuilder();
-    field public static final androidx.datastore.preferences.Preferences.Companion! Companion;
+    field public static final androidx.datastore.preferences.Preferences.Companion Companion;
   }
 
   public static final class Preferences.Builder {
@@ -41,7 +41,7 @@
 
   public final class SharedPreferencesMigration {
     method public static kotlin.jvm.functions.Function0<androidx.datastore.DataMigration<androidx.datastore.preferences.Preferences>> create(android.content.Context context, String sharedPreferencesName, java.util.Set<java.lang.String>? keysToMigrate = MIGRATE_ALL_KEYS, boolean deleteEmptyPreferences = true);
-    field public static final androidx.datastore.preferences.SharedPreferencesMigration.Companion! Companion;
+    field public static final androidx.datastore.preferences.SharedPreferencesMigration.Companion Companion;
   }
 
   public static final class SharedPreferencesMigration.Companion {
diff --git a/datastore/datastore-preferences/api/public_plus_experimental_current.txt b/datastore/datastore-preferences/api/public_plus_experimental_current.txt
index 45ea06f..7d90845 100644
--- a/datastore/datastore-preferences/api/public_plus_experimental_current.txt
+++ b/datastore/datastore-preferences/api/public_plus_experimental_current.txt
@@ -19,7 +19,7 @@
     method public String getString(String key, String defaultValue);
     method public java.util.Set<java.lang.String> getStringSet(String key, java.util.Set<java.lang.String> defaultValue);
     method public androidx.datastore.preferences.Preferences.Builder toBuilder();
-    field public static final androidx.datastore.preferences.Preferences.Companion! Companion;
+    field public static final androidx.datastore.preferences.Preferences.Companion Companion;
   }
 
   public static final class Preferences.Builder {
@@ -41,7 +41,7 @@
 
   public final class SharedPreferencesMigration {
     method public static kotlin.jvm.functions.Function0<androidx.datastore.DataMigration<androidx.datastore.preferences.Preferences>> create(android.content.Context context, String sharedPreferencesName, java.util.Set<java.lang.String>? keysToMigrate = MIGRATE_ALL_KEYS, boolean deleteEmptyPreferences = true);
-    field public static final androidx.datastore.preferences.SharedPreferencesMigration.Companion! Companion;
+    field public static final androidx.datastore.preferences.SharedPreferencesMigration.Companion Companion;
   }
 
   public static final class SharedPreferencesMigration.Companion {
diff --git a/datastore/datastore-preferences/api/restricted_1.0.0-alpha01.txt b/datastore/datastore-preferences/api/restricted_1.0.0-alpha01.txt
index 45ea06f..7d90845 100644
--- a/datastore/datastore-preferences/api/restricted_1.0.0-alpha01.txt
+++ b/datastore/datastore-preferences/api/restricted_1.0.0-alpha01.txt
@@ -19,7 +19,7 @@
     method public String getString(String key, String defaultValue);
     method public java.util.Set<java.lang.String> getStringSet(String key, java.util.Set<java.lang.String> defaultValue);
     method public androidx.datastore.preferences.Preferences.Builder toBuilder();
-    field public static final androidx.datastore.preferences.Preferences.Companion! Companion;
+    field public static final androidx.datastore.preferences.Preferences.Companion Companion;
   }
 
   public static final class Preferences.Builder {
@@ -41,7 +41,7 @@
 
   public final class SharedPreferencesMigration {
     method public static kotlin.jvm.functions.Function0<androidx.datastore.DataMigration<androidx.datastore.preferences.Preferences>> create(android.content.Context context, String sharedPreferencesName, java.util.Set<java.lang.String>? keysToMigrate = MIGRATE_ALL_KEYS, boolean deleteEmptyPreferences = true);
-    field public static final androidx.datastore.preferences.SharedPreferencesMigration.Companion! Companion;
+    field public static final androidx.datastore.preferences.SharedPreferencesMigration.Companion Companion;
   }
 
   public static final class SharedPreferencesMigration.Companion {
diff --git a/datastore/datastore-preferences/api/restricted_current.txt b/datastore/datastore-preferences/api/restricted_current.txt
index 45ea06f..7d90845 100644
--- a/datastore/datastore-preferences/api/restricted_current.txt
+++ b/datastore/datastore-preferences/api/restricted_current.txt
@@ -19,7 +19,7 @@
     method public String getString(String key, String defaultValue);
     method public java.util.Set<java.lang.String> getStringSet(String key, java.util.Set<java.lang.String> defaultValue);
     method public androidx.datastore.preferences.Preferences.Builder toBuilder();
-    field public static final androidx.datastore.preferences.Preferences.Companion! Companion;
+    field public static final androidx.datastore.preferences.Preferences.Companion Companion;
   }
 
   public static final class Preferences.Builder {
@@ -41,7 +41,7 @@
 
   public final class SharedPreferencesMigration {
     method public static kotlin.jvm.functions.Function0<androidx.datastore.DataMigration<androidx.datastore.preferences.Preferences>> create(android.content.Context context, String sharedPreferencesName, java.util.Set<java.lang.String>? keysToMigrate = MIGRATE_ALL_KEYS, boolean deleteEmptyPreferences = true);
-    field public static final androidx.datastore.preferences.SharedPreferencesMigration.Companion! Companion;
+    field public static final androidx.datastore.preferences.SharedPreferencesMigration.Companion Companion;
   }
 
   public static final class SharedPreferencesMigration.Companion {
diff --git a/leanback/leanback/api/1.1.0-alpha04.txt b/leanback/leanback/api/1.1.0-alpha04.txt
index ea90aa3..733f94f 100644
--- a/leanback/leanback/api/1.1.0-alpha04.txt
+++ b/leanback/leanback/api/1.1.0-alpha04.txt
@@ -1530,7 +1530,7 @@
     field public static final int VIEW_TYPE_EXTRA = 2; // 0x2
     field public static final int VIEW_TYPE_INFO = 1; // 0x1
     field public static final int VIEW_TYPE_MAIN = 0; // 0x0
-    field @android.view.ViewDebug.ExportedProperty(category="layout", mapping={@android.view.ViewDebug.IntToString(from=androidx.leanback.widget.BaseCardView.LayoutParams.VIEW_TYPE_MAIN, to="MAIN"), @android.view.ViewDebug.IntToString(from=androidx.leanback.widget.BaseCardView.LayoutParams.VIEW_TYPE_INFO, to="INFO"), @android.view.ViewDebug.IntToString(from=androidx.leanback.widget.BaseCardView.LayoutParams.VIEW_TYPE_EXTRA, to="EXTRA")}) public int viewType;
+    field public int viewType;
   }
 
   public abstract class BaseGridView extends androidx.recyclerview.widget.RecyclerView {
diff --git a/leanback/leanback/api/current.txt b/leanback/leanback/api/current.txt
index ea90aa3..733f94f 100644
--- a/leanback/leanback/api/current.txt
+++ b/leanback/leanback/api/current.txt
@@ -1530,7 +1530,7 @@
     field public static final int VIEW_TYPE_EXTRA = 2; // 0x2
     field public static final int VIEW_TYPE_INFO = 1; // 0x1
     field public static final int VIEW_TYPE_MAIN = 0; // 0x0
-    field @android.view.ViewDebug.ExportedProperty(category="layout", mapping={@android.view.ViewDebug.IntToString(from=androidx.leanback.widget.BaseCardView.LayoutParams.VIEW_TYPE_MAIN, to="MAIN"), @android.view.ViewDebug.IntToString(from=androidx.leanback.widget.BaseCardView.LayoutParams.VIEW_TYPE_INFO, to="INFO"), @android.view.ViewDebug.IntToString(from=androidx.leanback.widget.BaseCardView.LayoutParams.VIEW_TYPE_EXTRA, to="EXTRA")}) public int viewType;
+    field public int viewType;
   }
 
   public abstract class BaseGridView extends androidx.recyclerview.widget.RecyclerView {
diff --git a/leanback/leanback/api/public_plus_experimental_1.1.0-alpha04.txt b/leanback/leanback/api/public_plus_experimental_1.1.0-alpha04.txt
index ea90aa3..733f94f 100644
--- a/leanback/leanback/api/public_plus_experimental_1.1.0-alpha04.txt
+++ b/leanback/leanback/api/public_plus_experimental_1.1.0-alpha04.txt
@@ -1530,7 +1530,7 @@
     field public static final int VIEW_TYPE_EXTRA = 2; // 0x2
     field public static final int VIEW_TYPE_INFO = 1; // 0x1
     field public static final int VIEW_TYPE_MAIN = 0; // 0x0
-    field @android.view.ViewDebug.ExportedProperty(category="layout", mapping={@android.view.ViewDebug.IntToString(from=androidx.leanback.widget.BaseCardView.LayoutParams.VIEW_TYPE_MAIN, to="MAIN"), @android.view.ViewDebug.IntToString(from=androidx.leanback.widget.BaseCardView.LayoutParams.VIEW_TYPE_INFO, to="INFO"), @android.view.ViewDebug.IntToString(from=androidx.leanback.widget.BaseCardView.LayoutParams.VIEW_TYPE_EXTRA, to="EXTRA")}) public int viewType;
+    field public int viewType;
   }
 
   public abstract class BaseGridView extends androidx.recyclerview.widget.RecyclerView {
diff --git a/leanback/leanback/api/public_plus_experimental_current.txt b/leanback/leanback/api/public_plus_experimental_current.txt
index ea90aa3..733f94f 100644
--- a/leanback/leanback/api/public_plus_experimental_current.txt
+++ b/leanback/leanback/api/public_plus_experimental_current.txt
@@ -1530,7 +1530,7 @@
     field public static final int VIEW_TYPE_EXTRA = 2; // 0x2
     field public static final int VIEW_TYPE_INFO = 1; // 0x1
     field public static final int VIEW_TYPE_MAIN = 0; // 0x0
-    field @android.view.ViewDebug.ExportedProperty(category="layout", mapping={@android.view.ViewDebug.IntToString(from=androidx.leanback.widget.BaseCardView.LayoutParams.VIEW_TYPE_MAIN, to="MAIN"), @android.view.ViewDebug.IntToString(from=androidx.leanback.widget.BaseCardView.LayoutParams.VIEW_TYPE_INFO, to="INFO"), @android.view.ViewDebug.IntToString(from=androidx.leanback.widget.BaseCardView.LayoutParams.VIEW_TYPE_EXTRA, to="EXTRA")}) public int viewType;
+    field public int viewType;
   }
 
   public abstract class BaseGridView extends androidx.recyclerview.widget.RecyclerView {
diff --git a/leanback/leanback/api/restricted_1.1.0-alpha04.txt b/leanback/leanback/api/restricted_1.1.0-alpha04.txt
index 0606e63..dc22fe8 100644
--- a/leanback/leanback/api/restricted_1.1.0-alpha04.txt
+++ b/leanback/leanback/api/restricted_1.1.0-alpha04.txt
@@ -1740,7 +1740,7 @@
     field public static final int VIEW_TYPE_EXTRA = 2; // 0x2
     field public static final int VIEW_TYPE_INFO = 1; // 0x1
     field public static final int VIEW_TYPE_MAIN = 0; // 0x0
-    field @android.view.ViewDebug.ExportedProperty(category="layout", mapping={@android.view.ViewDebug.IntToString(from=androidx.leanback.widget.BaseCardView.LayoutParams.VIEW_TYPE_MAIN, to="MAIN"), @android.view.ViewDebug.IntToString(from=androidx.leanback.widget.BaseCardView.LayoutParams.VIEW_TYPE_INFO, to="INFO"), @android.view.ViewDebug.IntToString(from=androidx.leanback.widget.BaseCardView.LayoutParams.VIEW_TYPE_EXTRA, to="EXTRA")}) public int viewType;
+    field public int viewType;
   }
 
   public abstract class BaseGridView extends androidx.recyclerview.widget.RecyclerView {
diff --git a/leanback/leanback/api/restricted_current.txt b/leanback/leanback/api/restricted_current.txt
index 0606e63..dc22fe8 100644
--- a/leanback/leanback/api/restricted_current.txt
+++ b/leanback/leanback/api/restricted_current.txt
@@ -1740,7 +1740,7 @@
     field public static final int VIEW_TYPE_EXTRA = 2; // 0x2
     field public static final int VIEW_TYPE_INFO = 1; // 0x1
     field public static final int VIEW_TYPE_MAIN = 0; // 0x0
-    field @android.view.ViewDebug.ExportedProperty(category="layout", mapping={@android.view.ViewDebug.IntToString(from=androidx.leanback.widget.BaseCardView.LayoutParams.VIEW_TYPE_MAIN, to="MAIN"), @android.view.ViewDebug.IntToString(from=androidx.leanback.widget.BaseCardView.LayoutParams.VIEW_TYPE_INFO, to="INFO"), @android.view.ViewDebug.IntToString(from=androidx.leanback.widget.BaseCardView.LayoutParams.VIEW_TYPE_EXTRA, to="EXTRA")}) public int viewType;
+    field public int viewType;
   }
 
   public abstract class BaseGridView extends androidx.recyclerview.widget.RecyclerView {
diff --git a/media2/common/api/api_lint.ignore b/media2/common/api/api_lint.ignore
index d2bb9aa..d3d06d5 100644
--- a/media2/common/api/api_lint.ignore
+++ b/media2/common/api/api_lint.ignore
@@ -13,9 +13,5 @@
     Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.media2.common.MediaMetadata.Builder.putText(String,CharSequence)
 
 
-GenericException: androidx.media2.common.SessionPlayer#close():
-    Methods must not throw generic exceptions (`java.lang.Exception`)
-
-
 IntentName: androidx.media2.common.MediaMetadata#METADATA_KEY_EXTRAS:
     Intent extra constant name must be EXTRA_FOO: METADATA_KEY_EXTRAS
diff --git a/media2/player/api/api_lint.ignore b/media2/player/api/api_lint.ignore
index f6d216c..bc67ff2 100644
--- a/media2/player/api/api_lint.ignore
+++ b/media2/player/api/api_lint.ignore
@@ -7,9 +7,5 @@
     Must avoid boxed primitives (`java.lang.Float`)
 
 
-GenericException: androidx.media2.player.MediaPlayer#close():
-    Methods must not throw generic exceptions (`java.lang.Exception`)
-
-
 MissingNullability: androidx.media2.player.TimedMetaData#getMetaData():
     Missing nullability on method `getMetaData` return
diff --git a/paging/common/api/3.0.0-alpha03.txt b/paging/common/api/3.0.0-alpha03.txt
index 351532f..dd27c13 100644
--- a/paging/common/api/3.0.0-alpha03.txt
+++ b/paging/common/api/3.0.0-alpha03.txt
@@ -100,7 +100,7 @@
   }
 
   public static final class LoadState.Loading extends androidx.paging.LoadState {
-    field public static final androidx.paging.LoadState.Loading! INSTANCE;
+    field public static final androidx.paging.LoadState.Loading INSTANCE;
   }
 
   public static final class LoadState.NotLoading extends androidx.paging.LoadState {
@@ -119,6 +119,8 @@
   }
 
   public enum LoadType {
+    method public static androidx.paging.LoadType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.paging.LoadType[] values();
     enum_constant public static final androidx.paging.LoadType APPEND;
     enum_constant public static final androidx.paging.LoadType PREPEND;
     enum_constant public static final androidx.paging.LoadType REFRESH;
@@ -260,7 +262,7 @@
     ctor public PagingConfig(int pageSize, @IntRange(from=null) int prefetchDistance, boolean enablePlaceholders);
     ctor public PagingConfig(int pageSize, @IntRange(from=null) int prefetchDistance);
     ctor public PagingConfig(int pageSize);
-    field public static final androidx.paging.PagingConfig.Companion! Companion;
+    field public static final androidx.paging.PagingConfig.Companion Companion;
     field public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
     field public final boolean enablePlaceholders;
     field public final int initialLoadSize;
@@ -281,7 +283,7 @@
     method @CheckResult public androidx.paging.PagingData<T> insertHeaderItem(T item);
     method @CheckResult public static <T extends R, R> androidx.paging.PagingData<R> insertSeparators(androidx.paging.PagingData<T> pagingData, kotlin.jvm.functions.Function2<? super T,? super T,? extends R> generator);
     method @CheckResult public <R> androidx.paging.PagingData<R> map(kotlin.jvm.functions.Function1<? super T,? extends R> transform);
-    field public static final androidx.paging.PagingData.Companion! Companion;
+    field public static final androidx.paging.PagingData.Companion Companion;
   }
 
   public static final class PagingData.Companion {
@@ -358,7 +360,7 @@
     method public Key? getNextKey();
     method public Key? getPrevKey();
     field public static final int COUNT_UNDEFINED = -2147483648; // 0x80000000
-    field public static final androidx.paging.PagingSource.LoadResult.Page.Companion! Companion;
+    field public static final androidx.paging.PagingSource.LoadResult.Page.Companion Companion;
   }
 
   public static final class PagingSource.LoadResult.Page.Companion {
@@ -422,6 +424,8 @@
   }
 
   public enum RemoteMediator.InitializeAction {
+    method public static androidx.paging.RemoteMediator.InitializeAction valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.paging.RemoteMediator.InitializeAction[] values();
     enum_constant public static final androidx.paging.RemoteMediator.InitializeAction LAUNCH_INITIAL_REFRESH;
     enum_constant public static final androidx.paging.RemoteMediator.InitializeAction SKIP_INITIAL_REFRESH;
   }
diff --git a/paging/common/api/current.txt b/paging/common/api/current.txt
index 351532f..dd27c13 100644
--- a/paging/common/api/current.txt
+++ b/paging/common/api/current.txt
@@ -100,7 +100,7 @@
   }
 
   public static final class LoadState.Loading extends androidx.paging.LoadState {
-    field public static final androidx.paging.LoadState.Loading! INSTANCE;
+    field public static final androidx.paging.LoadState.Loading INSTANCE;
   }
 
   public static final class LoadState.NotLoading extends androidx.paging.LoadState {
@@ -119,6 +119,8 @@
   }
 
   public enum LoadType {
+    method public static androidx.paging.LoadType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.paging.LoadType[] values();
     enum_constant public static final androidx.paging.LoadType APPEND;
     enum_constant public static final androidx.paging.LoadType PREPEND;
     enum_constant public static final androidx.paging.LoadType REFRESH;
@@ -260,7 +262,7 @@
     ctor public PagingConfig(int pageSize, @IntRange(from=null) int prefetchDistance, boolean enablePlaceholders);
     ctor public PagingConfig(int pageSize, @IntRange(from=null) int prefetchDistance);
     ctor public PagingConfig(int pageSize);
-    field public static final androidx.paging.PagingConfig.Companion! Companion;
+    field public static final androidx.paging.PagingConfig.Companion Companion;
     field public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
     field public final boolean enablePlaceholders;
     field public final int initialLoadSize;
@@ -281,7 +283,7 @@
     method @CheckResult public androidx.paging.PagingData<T> insertHeaderItem(T item);
     method @CheckResult public static <T extends R, R> androidx.paging.PagingData<R> insertSeparators(androidx.paging.PagingData<T> pagingData, kotlin.jvm.functions.Function2<? super T,? super T,? extends R> generator);
     method @CheckResult public <R> androidx.paging.PagingData<R> map(kotlin.jvm.functions.Function1<? super T,? extends R> transform);
-    field public static final androidx.paging.PagingData.Companion! Companion;
+    field public static final androidx.paging.PagingData.Companion Companion;
   }
 
   public static final class PagingData.Companion {
@@ -358,7 +360,7 @@
     method public Key? getNextKey();
     method public Key? getPrevKey();
     field public static final int COUNT_UNDEFINED = -2147483648; // 0x80000000
-    field public static final androidx.paging.PagingSource.LoadResult.Page.Companion! Companion;
+    field public static final androidx.paging.PagingSource.LoadResult.Page.Companion Companion;
   }
 
   public static final class PagingSource.LoadResult.Page.Companion {
@@ -422,6 +424,8 @@
   }
 
   public enum RemoteMediator.InitializeAction {
+    method public static androidx.paging.RemoteMediator.InitializeAction valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.paging.RemoteMediator.InitializeAction[] values();
     enum_constant public static final androidx.paging.RemoteMediator.InitializeAction LAUNCH_INITIAL_REFRESH;
     enum_constant public static final androidx.paging.RemoteMediator.InitializeAction SKIP_INITIAL_REFRESH;
   }
diff --git a/paging/common/api/public_plus_experimental_3.0.0-alpha03.txt b/paging/common/api/public_plus_experimental_3.0.0-alpha03.txt
index a634c55..0776c3e 100644
--- a/paging/common/api/public_plus_experimental_3.0.0-alpha03.txt
+++ b/paging/common/api/public_plus_experimental_3.0.0-alpha03.txt
@@ -101,7 +101,7 @@
   }
 
   public static final class LoadState.Loading extends androidx.paging.LoadState {
-    field public static final androidx.paging.LoadState.Loading! INSTANCE;
+    field public static final androidx.paging.LoadState.Loading INSTANCE;
   }
 
   public static final class LoadState.NotLoading extends androidx.paging.LoadState {
@@ -121,6 +121,8 @@
   }
 
   public enum LoadType {
+    method public static androidx.paging.LoadType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.paging.LoadType[] values();
     enum_constant public static final androidx.paging.LoadType APPEND;
     enum_constant public static final androidx.paging.LoadType PREPEND;
     enum_constant public static final androidx.paging.LoadType REFRESH;
@@ -262,7 +264,7 @@
     ctor public PagingConfig(int pageSize, @IntRange(from=null) int prefetchDistance, boolean enablePlaceholders);
     ctor public PagingConfig(int pageSize, @IntRange(from=null) int prefetchDistance);
     ctor public PagingConfig(int pageSize);
-    field public static final androidx.paging.PagingConfig.Companion! Companion;
+    field public static final androidx.paging.PagingConfig.Companion Companion;
     field public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
     field public final boolean enablePlaceholders;
     field public final int initialLoadSize;
@@ -283,7 +285,7 @@
     method @CheckResult public androidx.paging.PagingData<T> insertHeaderItem(T item);
     method @CheckResult public static <T extends R, R> androidx.paging.PagingData<R> insertSeparators(androidx.paging.PagingData<T> pagingData, kotlin.jvm.functions.Function2<? super T,? super T,? extends R> generator);
     method @CheckResult public <R> androidx.paging.PagingData<R> map(kotlin.jvm.functions.Function1<? super T,? extends R> transform);
-    field public static final androidx.paging.PagingData.Companion! Companion;
+    field public static final androidx.paging.PagingData.Companion Companion;
   }
 
   public static final class PagingData.Companion {
@@ -360,7 +362,7 @@
     method public Key? getNextKey();
     method public Key? getPrevKey();
     field public static final int COUNT_UNDEFINED = -2147483648; // 0x80000000
-    field public static final androidx.paging.PagingSource.LoadResult.Page.Companion! Companion;
+    field public static final androidx.paging.PagingSource.LoadResult.Page.Companion Companion;
   }
 
   public static final class PagingSource.LoadResult.Page.Companion {
@@ -424,6 +426,8 @@
   }
 
   public enum RemoteMediator.InitializeAction {
+    method public static androidx.paging.RemoteMediator.InitializeAction valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.paging.RemoteMediator.InitializeAction[] values();
     enum_constant public static final androidx.paging.RemoteMediator.InitializeAction LAUNCH_INITIAL_REFRESH;
     enum_constant public static final androidx.paging.RemoteMediator.InitializeAction SKIP_INITIAL_REFRESH;
   }
diff --git a/paging/common/api/public_plus_experimental_current.txt b/paging/common/api/public_plus_experimental_current.txt
index a634c55..0776c3e 100644
--- a/paging/common/api/public_plus_experimental_current.txt
+++ b/paging/common/api/public_plus_experimental_current.txt
@@ -101,7 +101,7 @@
   }
 
   public static final class LoadState.Loading extends androidx.paging.LoadState {
-    field public static final androidx.paging.LoadState.Loading! INSTANCE;
+    field public static final androidx.paging.LoadState.Loading INSTANCE;
   }
 
   public static final class LoadState.NotLoading extends androidx.paging.LoadState {
@@ -121,6 +121,8 @@
   }
 
   public enum LoadType {
+    method public static androidx.paging.LoadType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.paging.LoadType[] values();
     enum_constant public static final androidx.paging.LoadType APPEND;
     enum_constant public static final androidx.paging.LoadType PREPEND;
     enum_constant public static final androidx.paging.LoadType REFRESH;
@@ -262,7 +264,7 @@
     ctor public PagingConfig(int pageSize, @IntRange(from=null) int prefetchDistance, boolean enablePlaceholders);
     ctor public PagingConfig(int pageSize, @IntRange(from=null) int prefetchDistance);
     ctor public PagingConfig(int pageSize);
-    field public static final androidx.paging.PagingConfig.Companion! Companion;
+    field public static final androidx.paging.PagingConfig.Companion Companion;
     field public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
     field public final boolean enablePlaceholders;
     field public final int initialLoadSize;
@@ -283,7 +285,7 @@
     method @CheckResult public androidx.paging.PagingData<T> insertHeaderItem(T item);
     method @CheckResult public static <T extends R, R> androidx.paging.PagingData<R> insertSeparators(androidx.paging.PagingData<T> pagingData, kotlin.jvm.functions.Function2<? super T,? super T,? extends R> generator);
     method @CheckResult public <R> androidx.paging.PagingData<R> map(kotlin.jvm.functions.Function1<? super T,? extends R> transform);
-    field public static final androidx.paging.PagingData.Companion! Companion;
+    field public static final androidx.paging.PagingData.Companion Companion;
   }
 
   public static final class PagingData.Companion {
@@ -360,7 +362,7 @@
     method public Key? getNextKey();
     method public Key? getPrevKey();
     field public static final int COUNT_UNDEFINED = -2147483648; // 0x80000000
-    field public static final androidx.paging.PagingSource.LoadResult.Page.Companion! Companion;
+    field public static final androidx.paging.PagingSource.LoadResult.Page.Companion Companion;
   }
 
   public static final class PagingSource.LoadResult.Page.Companion {
@@ -424,6 +426,8 @@
   }
 
   public enum RemoteMediator.InitializeAction {
+    method public static androidx.paging.RemoteMediator.InitializeAction valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.paging.RemoteMediator.InitializeAction[] values();
     enum_constant public static final androidx.paging.RemoteMediator.InitializeAction LAUNCH_INITIAL_REFRESH;
     enum_constant public static final androidx.paging.RemoteMediator.InitializeAction SKIP_INITIAL_REFRESH;
   }
diff --git a/paging/common/api/restricted_3.0.0-alpha03.txt b/paging/common/api/restricted_3.0.0-alpha03.txt
index 351532f..dd27c13 100644
--- a/paging/common/api/restricted_3.0.0-alpha03.txt
+++ b/paging/common/api/restricted_3.0.0-alpha03.txt
@@ -100,7 +100,7 @@
   }
 
   public static final class LoadState.Loading extends androidx.paging.LoadState {
-    field public static final androidx.paging.LoadState.Loading! INSTANCE;
+    field public static final androidx.paging.LoadState.Loading INSTANCE;
   }
 
   public static final class LoadState.NotLoading extends androidx.paging.LoadState {
@@ -119,6 +119,8 @@
   }
 
   public enum LoadType {
+    method public static androidx.paging.LoadType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.paging.LoadType[] values();
     enum_constant public static final androidx.paging.LoadType APPEND;
     enum_constant public static final androidx.paging.LoadType PREPEND;
     enum_constant public static final androidx.paging.LoadType REFRESH;
@@ -260,7 +262,7 @@
     ctor public PagingConfig(int pageSize, @IntRange(from=null) int prefetchDistance, boolean enablePlaceholders);
     ctor public PagingConfig(int pageSize, @IntRange(from=null) int prefetchDistance);
     ctor public PagingConfig(int pageSize);
-    field public static final androidx.paging.PagingConfig.Companion! Companion;
+    field public static final androidx.paging.PagingConfig.Companion Companion;
     field public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
     field public final boolean enablePlaceholders;
     field public final int initialLoadSize;
@@ -281,7 +283,7 @@
     method @CheckResult public androidx.paging.PagingData<T> insertHeaderItem(T item);
     method @CheckResult public static <T extends R, R> androidx.paging.PagingData<R> insertSeparators(androidx.paging.PagingData<T> pagingData, kotlin.jvm.functions.Function2<? super T,? super T,? extends R> generator);
     method @CheckResult public <R> androidx.paging.PagingData<R> map(kotlin.jvm.functions.Function1<? super T,? extends R> transform);
-    field public static final androidx.paging.PagingData.Companion! Companion;
+    field public static final androidx.paging.PagingData.Companion Companion;
   }
 
   public static final class PagingData.Companion {
@@ -358,7 +360,7 @@
     method public Key? getNextKey();
     method public Key? getPrevKey();
     field public static final int COUNT_UNDEFINED = -2147483648; // 0x80000000
-    field public static final androidx.paging.PagingSource.LoadResult.Page.Companion! Companion;
+    field public static final androidx.paging.PagingSource.LoadResult.Page.Companion Companion;
   }
 
   public static final class PagingSource.LoadResult.Page.Companion {
@@ -422,6 +424,8 @@
   }
 
   public enum RemoteMediator.InitializeAction {
+    method public static androidx.paging.RemoteMediator.InitializeAction valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.paging.RemoteMediator.InitializeAction[] values();
     enum_constant public static final androidx.paging.RemoteMediator.InitializeAction LAUNCH_INITIAL_REFRESH;
     enum_constant public static final androidx.paging.RemoteMediator.InitializeAction SKIP_INITIAL_REFRESH;
   }
diff --git a/paging/common/api/restricted_current.txt b/paging/common/api/restricted_current.txt
index 351532f..dd27c13 100644
--- a/paging/common/api/restricted_current.txt
+++ b/paging/common/api/restricted_current.txt
@@ -100,7 +100,7 @@
   }
 
   public static final class LoadState.Loading extends androidx.paging.LoadState {
-    field public static final androidx.paging.LoadState.Loading! INSTANCE;
+    field public static final androidx.paging.LoadState.Loading INSTANCE;
   }
 
   public static final class LoadState.NotLoading extends androidx.paging.LoadState {
@@ -119,6 +119,8 @@
   }
 
   public enum LoadType {
+    method public static androidx.paging.LoadType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.paging.LoadType[] values();
     enum_constant public static final androidx.paging.LoadType APPEND;
     enum_constant public static final androidx.paging.LoadType PREPEND;
     enum_constant public static final androidx.paging.LoadType REFRESH;
@@ -260,7 +262,7 @@
     ctor public PagingConfig(int pageSize, @IntRange(from=null) int prefetchDistance, boolean enablePlaceholders);
     ctor public PagingConfig(int pageSize, @IntRange(from=null) int prefetchDistance);
     ctor public PagingConfig(int pageSize);
-    field public static final androidx.paging.PagingConfig.Companion! Companion;
+    field public static final androidx.paging.PagingConfig.Companion Companion;
     field public static final int MAX_SIZE_UNBOUNDED = 2147483647; // 0x7fffffff
     field public final boolean enablePlaceholders;
     field public final int initialLoadSize;
@@ -281,7 +283,7 @@
     method @CheckResult public androidx.paging.PagingData<T> insertHeaderItem(T item);
     method @CheckResult public static <T extends R, R> androidx.paging.PagingData<R> insertSeparators(androidx.paging.PagingData<T> pagingData, kotlin.jvm.functions.Function2<? super T,? super T,? extends R> generator);
     method @CheckResult public <R> androidx.paging.PagingData<R> map(kotlin.jvm.functions.Function1<? super T,? extends R> transform);
-    field public static final androidx.paging.PagingData.Companion! Companion;
+    field public static final androidx.paging.PagingData.Companion Companion;
   }
 
   public static final class PagingData.Companion {
@@ -358,7 +360,7 @@
     method public Key? getNextKey();
     method public Key? getPrevKey();
     field public static final int COUNT_UNDEFINED = -2147483648; // 0x80000000
-    field public static final androidx.paging.PagingSource.LoadResult.Page.Companion! Companion;
+    field public static final androidx.paging.PagingSource.LoadResult.Page.Companion Companion;
   }
 
   public static final class PagingSource.LoadResult.Page.Companion {
@@ -422,6 +424,8 @@
   }
 
   public enum RemoteMediator.InitializeAction {
+    method public static androidx.paging.RemoteMediator.InitializeAction valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.paging.RemoteMediator.InitializeAction[] values();
     enum_constant public static final androidx.paging.RemoteMediator.InitializeAction LAUNCH_INITIAL_REFRESH;
     enum_constant public static final androidx.paging.RemoteMediator.InitializeAction SKIP_INITIAL_REFRESH;
   }
diff --git a/paging/rxjava2/api/api_lint.ignore b/paging/rxjava2/api/api_lint.ignore
index 153d977..43bf4f5 100644
--- a/paging/rxjava2/api/api_lint.ignore
+++ b/paging/rxjava2/api/api_lint.ignore
@@ -3,11 +3,3 @@
     Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.paging.RxPagedListBuilder.buildFlowable(io.reactivex.BackpressureStrategy)
 BuilderSetStyle: androidx.paging.RxPagedListBuilder#buildObservable():
     Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.paging.RxPagedListBuilder.buildObservable()
-
-
-MissingBuildMethod: androidx.paging.RxPagedListBuilder:
-    androidx.paging.RxPagedListBuilder does not declare a `build()` method, but builder classes are expected to
-
-
-TopLevelBuilder: androidx.paging.RxPagedListBuilder:
-    Builder should be defined as inner class: androidx.paging.RxPagedListBuilder
diff --git a/palette/palette/api/api_lint.ignore b/palette/palette/api/api_lint.ignore
index 162d7eb..85f67cb 100644
--- a/palette/palette/api/api_lint.ignore
+++ b/palette/palette/api/api_lint.ignore
@@ -1,8 +1,6 @@
 // Baseline format: 1.0
 BuilderSetStyle: androidx.palette.graphics.Palette.Builder#generate():
     Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.palette.graphics.Palette.Builder.generate()
-BuilderSetStyle: androidx.palette.graphics.Palette.Builder#generate(androidx.palette.graphics.Palette.PaletteAsyncListener):
-    Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.palette.graphics.Palette.Builder.generate(androidx.palette.graphics.Palette.PaletteAsyncListener)
 BuilderSetStyle: androidx.palette.graphics.Palette.Builder#maximumColorCount(int):
     Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.palette.graphics.Palette.Builder.maximumColorCount(int)
 BuilderSetStyle: androidx.palette.graphics.Palette.Builder#resizeBitmapArea(int):
diff --git a/room/ktx/api/restricted_2.3.0-alpha02.txt b/room/ktx/api/restricted_2.3.0-alpha02.txt
index cc27399..371c63c 100644
--- a/room/ktx/api/restricted_2.3.0-alpha02.txt
+++ b/room/ktx/api/restricted_2.3.0-alpha02.txt
@@ -5,7 +5,7 @@
     method public static <R> kotlinx.coroutines.flow.Flow<R> createFlow(androidx.room.RoomDatabase db, boolean inTransaction, String![] tableNames, java.util.concurrent.Callable<R> callable);
     method public static suspend <R> Object? execute(androidx.room.RoomDatabase p, boolean db, java.util.concurrent.Callable<R> inTransaction, kotlin.coroutines.Continuation<? super R> callable);
     method public static suspend <R> Object? execute(androidx.room.RoomDatabase p, boolean db, android.os.CancellationSignal inTransaction, java.util.concurrent.Callable<R> cancellationSignal, kotlin.coroutines.Continuation<? super R> callable);
-    field public static final androidx.room.CoroutinesRoom.Companion! Companion;
+    field public static final androidx.room.CoroutinesRoom.Companion Companion;
   }
 
   public static final class CoroutinesRoom.Companion {
diff --git a/room/ktx/api/restricted_current.txt b/room/ktx/api/restricted_current.txt
index cc27399..371c63c 100644
--- a/room/ktx/api/restricted_current.txt
+++ b/room/ktx/api/restricted_current.txt
@@ -5,7 +5,7 @@
     method public static <R> kotlinx.coroutines.flow.Flow<R> createFlow(androidx.room.RoomDatabase db, boolean inTransaction, String![] tableNames, java.util.concurrent.Callable<R> callable);
     method public static suspend <R> Object? execute(androidx.room.RoomDatabase p, boolean db, java.util.concurrent.Callable<R> inTransaction, kotlin.coroutines.Continuation<? super R> callable);
     method public static suspend <R> Object? execute(androidx.room.RoomDatabase p, boolean db, android.os.CancellationSignal inTransaction, java.util.concurrent.Callable<R> cancellationSignal, kotlin.coroutines.Continuation<? super R> callable);
-    field public static final androidx.room.CoroutinesRoom.Companion! Companion;
+    field public static final androidx.room.CoroutinesRoom.Companion Companion;
   }
 
   public static final class CoroutinesRoom.Companion {
diff --git a/security/crypto/api/api_lint.ignore b/security/crypto/api/api_lint.ignore
index b3ea816..0b681f2 100644
--- a/security/crypto/api/api_lint.ignore
+++ b/security/crypto/api/api_lint.ignore
@@ -9,7 +9,3 @@
     Listener methods should be named add/remove; was registerOnSharedPreferenceChangeListener
 RegistrationName: androidx.security.crypto.EncryptedSharedPreferences#unregisterOnSharedPreferenceChangeListener(android.content.SharedPreferences.OnSharedPreferenceChangeListener):
     Listener methods should be named add/remove; was unregisterOnSharedPreferenceChangeListener
-
-
-StreamFiles: androidx.security.crypto.EncryptedFile.Builder#Builder(java.io.File, android.content.Context, String, androidx.security.crypto.EncryptedFile.FileEncryptionScheme):
-    Methods accepting `File` should also accept `FileDescriptor` or streams: constructor androidx.security.crypto.EncryptedFile.Builder(java.io.File,android.content.Context,String,androidx.security.crypto.EncryptedFile.FileEncryptionScheme)
diff --git a/serialization/serialization-annotation/api/1.0.0-alpha01.txt b/serialization/serialization-annotation/api/1.0.0-alpha01.txt
index e3f604ac..5570701 100644
--- a/serialization/serialization-annotation/api/1.0.0-alpha01.txt
+++ b/serialization/serialization-annotation/api/1.0.0-alpha01.txt
@@ -23,6 +23,8 @@
   }
 
   public enum ProtoEncoding {
+    method public static androidx.serialization.ProtoEncoding valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.serialization.ProtoEncoding[] values();
     enum_constant public static final androidx.serialization.ProtoEncoding DEFAULT;
     enum_constant public static final androidx.serialization.ProtoEncoding SIGNED_FIXED;
     enum_constant public static final androidx.serialization.ProtoEncoding SIGNED_VARINT;
diff --git a/serialization/serialization-annotation/api/current.txt b/serialization/serialization-annotation/api/current.txt
index e3f604ac..5570701 100644
--- a/serialization/serialization-annotation/api/current.txt
+++ b/serialization/serialization-annotation/api/current.txt
@@ -23,6 +23,8 @@
   }
 
   public enum ProtoEncoding {
+    method public static androidx.serialization.ProtoEncoding valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.serialization.ProtoEncoding[] values();
     enum_constant public static final androidx.serialization.ProtoEncoding DEFAULT;
     enum_constant public static final androidx.serialization.ProtoEncoding SIGNED_FIXED;
     enum_constant public static final androidx.serialization.ProtoEncoding SIGNED_VARINT;
diff --git a/serialization/serialization-annotation/api/public_plus_experimental_1.0.0-alpha01.txt b/serialization/serialization-annotation/api/public_plus_experimental_1.0.0-alpha01.txt
index e3f604ac..5570701 100644
--- a/serialization/serialization-annotation/api/public_plus_experimental_1.0.0-alpha01.txt
+++ b/serialization/serialization-annotation/api/public_plus_experimental_1.0.0-alpha01.txt
@@ -23,6 +23,8 @@
   }
 
   public enum ProtoEncoding {
+    method public static androidx.serialization.ProtoEncoding valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.serialization.ProtoEncoding[] values();
     enum_constant public static final androidx.serialization.ProtoEncoding DEFAULT;
     enum_constant public static final androidx.serialization.ProtoEncoding SIGNED_FIXED;
     enum_constant public static final androidx.serialization.ProtoEncoding SIGNED_VARINT;
diff --git a/serialization/serialization-annotation/api/public_plus_experimental_current.txt b/serialization/serialization-annotation/api/public_plus_experimental_current.txt
index e3f604ac..5570701 100644
--- a/serialization/serialization-annotation/api/public_plus_experimental_current.txt
+++ b/serialization/serialization-annotation/api/public_plus_experimental_current.txt
@@ -23,6 +23,8 @@
   }
 
   public enum ProtoEncoding {
+    method public static androidx.serialization.ProtoEncoding valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.serialization.ProtoEncoding[] values();
     enum_constant public static final androidx.serialization.ProtoEncoding DEFAULT;
     enum_constant public static final androidx.serialization.ProtoEncoding SIGNED_FIXED;
     enum_constant public static final androidx.serialization.ProtoEncoding SIGNED_VARINT;
diff --git a/serialization/serialization-annotation/api/restricted_1.0.0-alpha01.txt b/serialization/serialization-annotation/api/restricted_1.0.0-alpha01.txt
index e3f604ac..5570701 100644
--- a/serialization/serialization-annotation/api/restricted_1.0.0-alpha01.txt
+++ b/serialization/serialization-annotation/api/restricted_1.0.0-alpha01.txt
@@ -23,6 +23,8 @@
   }
 
   public enum ProtoEncoding {
+    method public static androidx.serialization.ProtoEncoding valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.serialization.ProtoEncoding[] values();
     enum_constant public static final androidx.serialization.ProtoEncoding DEFAULT;
     enum_constant public static final androidx.serialization.ProtoEncoding SIGNED_FIXED;
     enum_constant public static final androidx.serialization.ProtoEncoding SIGNED_VARINT;
diff --git a/serialization/serialization-annotation/api/restricted_current.txt b/serialization/serialization-annotation/api/restricted_current.txt
index e3f604ac..5570701 100644
--- a/serialization/serialization-annotation/api/restricted_current.txt
+++ b/serialization/serialization-annotation/api/restricted_current.txt
@@ -23,6 +23,8 @@
   }
 
   public enum ProtoEncoding {
+    method public static androidx.serialization.ProtoEncoding valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.serialization.ProtoEncoding[] values();
     enum_constant public static final androidx.serialization.ProtoEncoding DEFAULT;
     enum_constant public static final androidx.serialization.ProtoEncoding SIGNED_FIXED;
     enum_constant public static final androidx.serialization.ProtoEncoding SIGNED_VARINT;
diff --git a/textclassifier/textclassifier/api/1.0.0-alpha03.txt b/textclassifier/textclassifier/api/1.0.0-alpha03.txt
index 21567f3..79c4717 100644
--- a/textclassifier/textclassifier/api/1.0.0-alpha03.txt
+++ b/textclassifier/textclassifier/api/1.0.0-alpha03.txt
@@ -271,7 +271,7 @@
   }
 
   public final class TextLinksParams {
-    field public static final androidx.textclassifier.TextLinksParams! DEFAULT_PARAMS;
+    field public static final androidx.textclassifier.TextLinksParams DEFAULT_PARAMS;
   }
 
   public static final class TextLinksParams.Builder {
diff --git a/textclassifier/textclassifier/api/api_lint.ignore b/textclassifier/textclassifier/api/api_lint.ignore
index b4fcb1d..aec5e8c 100644
--- a/textclassifier/textclassifier/api/api_lint.ignore
+++ b/textclassifier/textclassifier/api/api_lint.ignore
@@ -47,7 +47,5 @@
     Missing nullability on method `createSpan` return
 MissingNullability: androidx.textclassifier.TextLinks.TextLink#getConfidenceScore(String) parameter #0:
     Missing nullability on parameter `entityType` in method `getConfidenceScore`
-MissingNullability: androidx.textclassifier.TextLinksParams#DEFAULT_PARAMS:
-    Missing nullability on field `DEFAULT_PARAMS` in class `class androidx.textclassifier.TextLinksParams`
 MissingNullability: androidx.textclassifier.TextSelection#getConfidenceScore(String) parameter #0:
     Missing nullability on parameter `entity` in method `getConfidenceScore`
diff --git a/textclassifier/textclassifier/api/current.txt b/textclassifier/textclassifier/api/current.txt
index 21567f3..79c4717 100644
--- a/textclassifier/textclassifier/api/current.txt
+++ b/textclassifier/textclassifier/api/current.txt
@@ -271,7 +271,7 @@
   }
 
   public final class TextLinksParams {
-    field public static final androidx.textclassifier.TextLinksParams! DEFAULT_PARAMS;
+    field public static final androidx.textclassifier.TextLinksParams DEFAULT_PARAMS;
   }
 
   public static final class TextLinksParams.Builder {
diff --git a/textclassifier/textclassifier/api/public_plus_experimental_1.0.0-alpha03.txt b/textclassifier/textclassifier/api/public_plus_experimental_1.0.0-alpha03.txt
index 21567f3..79c4717 100644
--- a/textclassifier/textclassifier/api/public_plus_experimental_1.0.0-alpha03.txt
+++ b/textclassifier/textclassifier/api/public_plus_experimental_1.0.0-alpha03.txt
@@ -271,7 +271,7 @@
   }
 
   public final class TextLinksParams {
-    field public static final androidx.textclassifier.TextLinksParams! DEFAULT_PARAMS;
+    field public static final androidx.textclassifier.TextLinksParams DEFAULT_PARAMS;
   }
 
   public static final class TextLinksParams.Builder {
diff --git a/textclassifier/textclassifier/api/public_plus_experimental_current.txt b/textclassifier/textclassifier/api/public_plus_experimental_current.txt
index 21567f3..79c4717 100644
--- a/textclassifier/textclassifier/api/public_plus_experimental_current.txt
+++ b/textclassifier/textclassifier/api/public_plus_experimental_current.txt
@@ -271,7 +271,7 @@
   }
 
   public final class TextLinksParams {
-    field public static final androidx.textclassifier.TextLinksParams! DEFAULT_PARAMS;
+    field public static final androidx.textclassifier.TextLinksParams DEFAULT_PARAMS;
   }
 
   public static final class TextLinksParams.Builder {
diff --git a/textclassifier/textclassifier/api/restricted_1.0.0-alpha03.txt b/textclassifier/textclassifier/api/restricted_1.0.0-alpha03.txt
index 3e183d8..2ab5708 100644
--- a/textclassifier/textclassifier/api/restricted_1.0.0-alpha03.txt
+++ b/textclassifier/textclassifier/api/restricted_1.0.0-alpha03.txt
@@ -318,7 +318,7 @@
   }
 
   public final class TextLinksParams {
-    field public static final androidx.textclassifier.TextLinksParams! DEFAULT_PARAMS;
+    field public static final androidx.textclassifier.TextLinksParams DEFAULT_PARAMS;
   }
 
   public static final class TextLinksParams.Builder {
diff --git a/textclassifier/textclassifier/api/restricted_current.txt b/textclassifier/textclassifier/api/restricted_current.txt
index 3e183d8..2ab5708 100644
--- a/textclassifier/textclassifier/api/restricted_current.txt
+++ b/textclassifier/textclassifier/api/restricted_current.txt
@@ -318,7 +318,7 @@
   }
 
   public final class TextLinksParams {
-    field public static final androidx.textclassifier.TextLinksParams! DEFAULT_PARAMS;
+    field public static final androidx.textclassifier.TextLinksParams DEFAULT_PARAMS;
   }
 
   public static final class TextLinksParams.Builder {
diff --git a/tv-provider/tv-provider/api/api_lint.ignore b/tv-provider/tv-provider/api/api_lint.ignore
index 7c43e2f..783a749 100644
--- a/tv-provider/tv-provider/api/api_lint.ignore
+++ b/tv-provider/tv-provider/api/api_lint.ignore
@@ -305,12 +305,6 @@
     Missing nullability on method `downloadBitmap` return
 MissingNullability: androidx.tvprovider.media.tv.PreviewChannelHelper#getAllChannels():
     Missing nullability on method `getAllChannels` return
-MissingNullability: androidx.tvprovider.media.tv.PreviewChannelHelper#getPreviewChannel(long):
-    Missing nullability on method `getPreviewChannel` return
-MissingNullability: androidx.tvprovider.media.tv.PreviewChannelHelper#getPreviewProgram(long):
-    Missing nullability on method `getPreviewProgram` return
-MissingNullability: androidx.tvprovider.media.tv.PreviewChannelHelper#getWatchNextProgram(long):
-    Missing nullability on method `getWatchNextProgram` return
 MissingNullability: androidx.tvprovider.media.tv.PreviewProgram#fromCursor(android.database.Cursor):
     Missing nullability on method `fromCursor` return
 MissingNullability: androidx.tvprovider.media.tv.PreviewProgram#fromCursor(android.database.Cursor) parameter #0:
diff --git a/ui/ui-animation-core/api/0.1.0-dev15.txt b/ui/ui-animation-core/api/0.1.0-dev15.txt
index 5b19c68..27407b0 100644
--- a/ui/ui-animation-core/api/0.1.0-dev15.txt
+++ b/ui/ui-animation-core/api/0.1.0-dev15.txt
@@ -60,6 +60,8 @@
   }
 
   public enum AnimationEndReason {
+    method public static androidx.animation.AnimationEndReason valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.animation.AnimationEndReason[] values();
     enum_constant public static final androidx.animation.AnimationEndReason BoundReached;
     enum_constant public static final androidx.animation.AnimationEndReason Interrupted;
     enum_constant public static final androidx.animation.AnimationEndReason TargetReached;
@@ -169,7 +171,7 @@
     ctor public BaseAnimationClock();
     method public void subscribe(androidx.animation.AnimationClockObserver observer);
     method public void unsubscribe(androidx.animation.AnimationClockObserver observer);
-    field @Deprecated public static final androidx.animation.BaseAnimationClock.Companion! Companion;
+    field @Deprecated public static final androidx.animation.BaseAnimationClock.Companion Companion;
   }
 
   public final class ComplexDoubleKt {
@@ -292,6 +294,8 @@
   }
 
   public enum InterruptionHandling {
+    method public static androidx.animation.InterruptionHandling valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.animation.InterruptionHandling[] values();
     enum_constant public static final androidx.animation.InterruptionHandling PHYSICS;
     enum_constant public static final androidx.animation.InterruptionHandling SNAP_TO_END;
     enum_constant public static final androidx.animation.InterruptionHandling TWEEN;
@@ -394,7 +398,7 @@
     field public static final float DampingRatioMediumBouncy = 0.5f;
     field public static final float DampingRatioNoBouncy = 1.0f;
     field public static final float DefaultDisplacementThreshold = 0.01f;
-    field public static final androidx.animation.Spring! INSTANCE;
+    field public static final androidx.animation.Spring INSTANCE;
     field public static final float StiffnessHigh = 10000.0f;
     field public static final float StiffnessLow = 200.0f;
     field public static final float StiffnessMedium = 1500.0f;
diff --git a/ui/ui-animation-core/api/api_lint.ignore b/ui/ui-animation-core/api/api_lint.ignore
index 35e0da1..a5bb439 100644
--- a/ui/ui-animation-core/api/api_lint.ignore
+++ b/ui/ui-animation-core/api/api_lint.ignore
@@ -17,8 +17,6 @@
 
 CallbackName: androidx.animation.AnimationClockObserver:
     Class should be named AnimationClockCallback
-CallbackName: androidx.animation.TransitionAnimation.TransitionAnimationClockObserver:
-    Class should be named TransitionAnimationClockCallback
 
 
 DocumentExceptions: androidx.animation.DurationBasedAnimationBuilder#setDelay(int):
diff --git a/ui/ui-animation-core/api/current.txt b/ui/ui-animation-core/api/current.txt
index 5b19c68..27407b0 100644
--- a/ui/ui-animation-core/api/current.txt
+++ b/ui/ui-animation-core/api/current.txt
@@ -60,6 +60,8 @@
   }
 
   public enum AnimationEndReason {
+    method public static androidx.animation.AnimationEndReason valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.animation.AnimationEndReason[] values();
     enum_constant public static final androidx.animation.AnimationEndReason BoundReached;
     enum_constant public static final androidx.animation.AnimationEndReason Interrupted;
     enum_constant public static final androidx.animation.AnimationEndReason TargetReached;
@@ -169,7 +171,7 @@
     ctor public BaseAnimationClock();
     method public void subscribe(androidx.animation.AnimationClockObserver observer);
     method public void unsubscribe(androidx.animation.AnimationClockObserver observer);
-    field @Deprecated public static final androidx.animation.BaseAnimationClock.Companion! Companion;
+    field @Deprecated public static final androidx.animation.BaseAnimationClock.Companion Companion;
   }
 
   public final class ComplexDoubleKt {
@@ -292,6 +294,8 @@
   }
 
   public enum InterruptionHandling {
+    method public static androidx.animation.InterruptionHandling valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.animation.InterruptionHandling[] values();
     enum_constant public static final androidx.animation.InterruptionHandling PHYSICS;
     enum_constant public static final androidx.animation.InterruptionHandling SNAP_TO_END;
     enum_constant public static final androidx.animation.InterruptionHandling TWEEN;
@@ -394,7 +398,7 @@
     field public static final float DampingRatioMediumBouncy = 0.5f;
     field public static final float DampingRatioNoBouncy = 1.0f;
     field public static final float DefaultDisplacementThreshold = 0.01f;
-    field public static final androidx.animation.Spring! INSTANCE;
+    field public static final androidx.animation.Spring INSTANCE;
     field public static final float StiffnessHigh = 10000.0f;
     field public static final float StiffnessLow = 200.0f;
     field public static final float StiffnessMedium = 1500.0f;
diff --git a/ui/ui-animation-core/api/public_plus_experimental_0.1.0-dev15.txt b/ui/ui-animation-core/api/public_plus_experimental_0.1.0-dev15.txt
index 5b19c68..27407b0 100644
--- a/ui/ui-animation-core/api/public_plus_experimental_0.1.0-dev15.txt
+++ b/ui/ui-animation-core/api/public_plus_experimental_0.1.0-dev15.txt
@@ -60,6 +60,8 @@
   }
 
   public enum AnimationEndReason {
+    method public static androidx.animation.AnimationEndReason valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.animation.AnimationEndReason[] values();
     enum_constant public static final androidx.animation.AnimationEndReason BoundReached;
     enum_constant public static final androidx.animation.AnimationEndReason Interrupted;
     enum_constant public static final androidx.animation.AnimationEndReason TargetReached;
@@ -169,7 +171,7 @@
     ctor public BaseAnimationClock();
     method public void subscribe(androidx.animation.AnimationClockObserver observer);
     method public void unsubscribe(androidx.animation.AnimationClockObserver observer);
-    field @Deprecated public static final androidx.animation.BaseAnimationClock.Companion! Companion;
+    field @Deprecated public static final androidx.animation.BaseAnimationClock.Companion Companion;
   }
 
   public final class ComplexDoubleKt {
@@ -292,6 +294,8 @@
   }
 
   public enum InterruptionHandling {
+    method public static androidx.animation.InterruptionHandling valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.animation.InterruptionHandling[] values();
     enum_constant public static final androidx.animation.InterruptionHandling PHYSICS;
     enum_constant public static final androidx.animation.InterruptionHandling SNAP_TO_END;
     enum_constant public static final androidx.animation.InterruptionHandling TWEEN;
@@ -394,7 +398,7 @@
     field public static final float DampingRatioMediumBouncy = 0.5f;
     field public static final float DampingRatioNoBouncy = 1.0f;
     field public static final float DefaultDisplacementThreshold = 0.01f;
-    field public static final androidx.animation.Spring! INSTANCE;
+    field public static final androidx.animation.Spring INSTANCE;
     field public static final float StiffnessHigh = 10000.0f;
     field public static final float StiffnessLow = 200.0f;
     field public static final float StiffnessMedium = 1500.0f;
diff --git a/ui/ui-animation-core/api/public_plus_experimental_current.txt b/ui/ui-animation-core/api/public_plus_experimental_current.txt
index 5b19c68..27407b0 100644
--- a/ui/ui-animation-core/api/public_plus_experimental_current.txt
+++ b/ui/ui-animation-core/api/public_plus_experimental_current.txt
@@ -60,6 +60,8 @@
   }
 
   public enum AnimationEndReason {
+    method public static androidx.animation.AnimationEndReason valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.animation.AnimationEndReason[] values();
     enum_constant public static final androidx.animation.AnimationEndReason BoundReached;
     enum_constant public static final androidx.animation.AnimationEndReason Interrupted;
     enum_constant public static final androidx.animation.AnimationEndReason TargetReached;
@@ -169,7 +171,7 @@
     ctor public BaseAnimationClock();
     method public void subscribe(androidx.animation.AnimationClockObserver observer);
     method public void unsubscribe(androidx.animation.AnimationClockObserver observer);
-    field @Deprecated public static final androidx.animation.BaseAnimationClock.Companion! Companion;
+    field @Deprecated public static final androidx.animation.BaseAnimationClock.Companion Companion;
   }
 
   public final class ComplexDoubleKt {
@@ -292,6 +294,8 @@
   }
 
   public enum InterruptionHandling {
+    method public static androidx.animation.InterruptionHandling valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.animation.InterruptionHandling[] values();
     enum_constant public static final androidx.animation.InterruptionHandling PHYSICS;
     enum_constant public static final androidx.animation.InterruptionHandling SNAP_TO_END;
     enum_constant public static final androidx.animation.InterruptionHandling TWEEN;
@@ -394,7 +398,7 @@
     field public static final float DampingRatioMediumBouncy = 0.5f;
     field public static final float DampingRatioNoBouncy = 1.0f;
     field public static final float DefaultDisplacementThreshold = 0.01f;
-    field public static final androidx.animation.Spring! INSTANCE;
+    field public static final androidx.animation.Spring INSTANCE;
     field public static final float StiffnessHigh = 10000.0f;
     field public static final float StiffnessLow = 200.0f;
     field public static final float StiffnessMedium = 1500.0f;
diff --git a/ui/ui-animation-core/api/restricted_0.1.0-dev15.txt b/ui/ui-animation-core/api/restricted_0.1.0-dev15.txt
index 5b19c68..27407b0 100644
--- a/ui/ui-animation-core/api/restricted_0.1.0-dev15.txt
+++ b/ui/ui-animation-core/api/restricted_0.1.0-dev15.txt
@@ -60,6 +60,8 @@
   }
 
   public enum AnimationEndReason {
+    method public static androidx.animation.AnimationEndReason valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.animation.AnimationEndReason[] values();
     enum_constant public static final androidx.animation.AnimationEndReason BoundReached;
     enum_constant public static final androidx.animation.AnimationEndReason Interrupted;
     enum_constant public static final androidx.animation.AnimationEndReason TargetReached;
@@ -169,7 +171,7 @@
     ctor public BaseAnimationClock();
     method public void subscribe(androidx.animation.AnimationClockObserver observer);
     method public void unsubscribe(androidx.animation.AnimationClockObserver observer);
-    field @Deprecated public static final androidx.animation.BaseAnimationClock.Companion! Companion;
+    field @Deprecated public static final androidx.animation.BaseAnimationClock.Companion Companion;
   }
 
   public final class ComplexDoubleKt {
@@ -292,6 +294,8 @@
   }
 
   public enum InterruptionHandling {
+    method public static androidx.animation.InterruptionHandling valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.animation.InterruptionHandling[] values();
     enum_constant public static final androidx.animation.InterruptionHandling PHYSICS;
     enum_constant public static final androidx.animation.InterruptionHandling SNAP_TO_END;
     enum_constant public static final androidx.animation.InterruptionHandling TWEEN;
@@ -394,7 +398,7 @@
     field public static final float DampingRatioMediumBouncy = 0.5f;
     field public static final float DampingRatioNoBouncy = 1.0f;
     field public static final float DefaultDisplacementThreshold = 0.01f;
-    field public static final androidx.animation.Spring! INSTANCE;
+    field public static final androidx.animation.Spring INSTANCE;
     field public static final float StiffnessHigh = 10000.0f;
     field public static final float StiffnessLow = 200.0f;
     field public static final float StiffnessMedium = 1500.0f;
diff --git a/ui/ui-animation-core/api/restricted_current.txt b/ui/ui-animation-core/api/restricted_current.txt
index 5b19c68..27407b0 100644
--- a/ui/ui-animation-core/api/restricted_current.txt
+++ b/ui/ui-animation-core/api/restricted_current.txt
@@ -60,6 +60,8 @@
   }
 
   public enum AnimationEndReason {
+    method public static androidx.animation.AnimationEndReason valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.animation.AnimationEndReason[] values();
     enum_constant public static final androidx.animation.AnimationEndReason BoundReached;
     enum_constant public static final androidx.animation.AnimationEndReason Interrupted;
     enum_constant public static final androidx.animation.AnimationEndReason TargetReached;
@@ -169,7 +171,7 @@
     ctor public BaseAnimationClock();
     method public void subscribe(androidx.animation.AnimationClockObserver observer);
     method public void unsubscribe(androidx.animation.AnimationClockObserver observer);
-    field @Deprecated public static final androidx.animation.BaseAnimationClock.Companion! Companion;
+    field @Deprecated public static final androidx.animation.BaseAnimationClock.Companion Companion;
   }
 
   public final class ComplexDoubleKt {
@@ -292,6 +294,8 @@
   }
 
   public enum InterruptionHandling {
+    method public static androidx.animation.InterruptionHandling valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.animation.InterruptionHandling[] values();
     enum_constant public static final androidx.animation.InterruptionHandling PHYSICS;
     enum_constant public static final androidx.animation.InterruptionHandling SNAP_TO_END;
     enum_constant public static final androidx.animation.InterruptionHandling TWEEN;
@@ -394,7 +398,7 @@
     field public static final float DampingRatioMediumBouncy = 0.5f;
     field public static final float DampingRatioNoBouncy = 1.0f;
     field public static final float DefaultDisplacementThreshold = 0.01f;
-    field public static final androidx.animation.Spring! INSTANCE;
+    field public static final androidx.animation.Spring INSTANCE;
     field public static final float StiffnessHigh = 10000.0f;
     field public static final float StiffnessLow = 200.0f;
     field public static final float StiffnessMedium = 1500.0f;
diff --git a/ui/ui-core/api/0.1.0-dev15.txt b/ui/ui-core/api/0.1.0-dev15.txt
index e08d741..563f5bc 100644
--- a/ui/ui-core/api/0.1.0-dev15.txt
+++ b/ui/ui-core/api/0.1.0-dev15.txt
@@ -38,6 +38,8 @@
   }
 
   public enum AutofillType {
+    method public static androidx.ui.autofill.AutofillType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.autofill.AutofillType[] values();
     enum_constant public static final androidx.ui.autofill.AutofillType AddressAuxiliaryDetails;
     enum_constant public static final androidx.ui.autofill.AutofillType AddressCountry;
     enum_constant public static final androidx.ui.autofill.AutofillType AddressLocality;
@@ -84,7 +86,7 @@
   @androidx.compose.Immutable public final class AbsoluteAlignment implements androidx.ui.core.Alignment {
     method public androidx.ui.unit.IntOffset align(androidx.ui.unit.IntSize size, androidx.ui.core.LayoutDirection layoutDirection);
     method @androidx.compose.Immutable public androidx.ui.core.AbsoluteAlignment copy(float verticalBias, float horizontalBias);
-    field public static final androidx.ui.core.AbsoluteAlignment.Companion! Companion;
+    field public static final androidx.ui.core.AbsoluteAlignment.Companion Companion;
   }
 
   public static final class AbsoluteAlignment.Companion {
@@ -113,7 +115,7 @@
 
   @androidx.compose.Immutable public interface Alignment {
     method public androidx.ui.unit.IntOffset align(androidx.ui.unit.IntSize size, androidx.ui.core.LayoutDirection layoutDirection = LayoutDirection.Ltr);
-    field public static final androidx.ui.core.Alignment.Companion! Companion;
+    field public static final androidx.ui.core.Alignment.Companion Companion;
   }
 
   public static final class Alignment.Companion {
@@ -158,7 +160,7 @@
   }
 
   @androidx.compose.Immutable public abstract sealed class AlignmentLine {
-    field public static final androidx.ui.core.AlignmentLine.Companion! Companion;
+    field public static final androidx.ui.core.AlignmentLine.Companion Companion;
     field public static final int Unspecified = -2147483648; // 0x80000000
   }
 
@@ -248,7 +250,7 @@
 
   @androidx.compose.Stable public interface ContentScale {
     method public float scale(androidx.ui.geometry.Size srcSize, androidx.ui.geometry.Size dstSize);
-    field public static final androidx.ui.core.ContentScale.Companion! Companion;
+    field public static final androidx.ui.core.ContentScale.Companion Companion;
   }
 
   public static final class ContentScale.Companion {
@@ -282,6 +284,8 @@
   }
 
   public enum Direction {
+    method public static androidx.ui.core.Direction valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.Direction[] values();
     enum_constant public static final androidx.ui.core.Direction DOWN;
     enum_constant public static final androidx.ui.core.Direction LEFT;
     enum_constant public static final androidx.ui.core.Direction RIGHT;
@@ -334,6 +338,8 @@
   }
 
   public enum DropDownAlignment {
+    method public static androidx.ui.core.DropDownAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.DropDownAlignment[] values();
     enum_constant public static final androidx.ui.core.DropDownAlignment End;
     enum_constant public static final androidx.ui.core.DropDownAlignment Start;
   }
@@ -491,6 +497,8 @@
   }
 
   public enum LayoutNode.LayoutState {
+    method public static androidx.ui.core.LayoutNode.LayoutState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.LayoutNode.LayoutState[] values();
     enum_constant public static final androidx.ui.core.LayoutNode.LayoutState LayingOut;
     enum_constant public static final androidx.ui.core.LayoutNode.LayoutState Measuring;
     enum_constant public static final androidx.ui.core.LayoutNode.LayoutState NeedsRelayout;
@@ -572,7 +580,7 @@
     method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
     method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
     method public default operator androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
-    field public static final androidx.ui.core.Modifier.Companion! Companion;
+    field public static final androidx.ui.core.Modifier.Companion Companion;
   }
 
   public static final class Modifier.Companion implements androidx.ui.core.Modifier {
@@ -672,7 +680,7 @@
     property public abstract boolean showLayoutBounds;
     property public abstract androidx.ui.input.TextInputService textInputService;
     property public abstract androidx.ui.core.texttoolbar.TextToolbar textToolbar;
-    field public static final androidx.ui.core.Owner.Companion! Companion;
+    field public static final androidx.ui.core.Owner.Companion Companion;
   }
 
   public static final class Owner.Companion {
@@ -722,6 +730,8 @@
   }
 
   public enum PointerEventPass {
+    method public static androidx.ui.core.PointerEventPass valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.PointerEventPass[] values();
     enum_constant public static final androidx.ui.core.PointerEventPass InitialDown;
     enum_constant public static final androidx.ui.core.PointerEventPass PostDown;
     enum_constant public static final androidx.ui.core.PointerEventPass PostUp;
@@ -813,7 +823,7 @@
     method public static float getPivotFractionY-impl(long $this);
     method @androidx.compose.Immutable public static inline int hashCode-impl(long p);
     method @androidx.compose.Immutable public static inline String! toString-impl(long p);
-    field public static final androidx.ui.core.TransformOrigin.Companion! Companion;
+    field public static final androidx.ui.core.TransformOrigin.Companion Companion;
   }
 
   public static final class TransformOrigin.Companion {
@@ -876,6 +886,8 @@
 package androidx.ui.core.focus {
 
   public enum FocusDetailedState {
+    method public static androidx.ui.core.focus.FocusDetailedState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.focus.FocusDetailedState[] values();
     enum_constant public static final androidx.ui.core.focus.FocusDetailedState Active;
     enum_constant public static final androidx.ui.core.focus.FocusDetailedState ActiveParent;
     enum_constant public static final androidx.ui.core.focus.FocusDetailedState Captured;
@@ -900,6 +912,8 @@
   }
 
   public enum FocusState {
+    method public static androidx.ui.core.focus.FocusState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.focus.FocusState[] values();
     enum_constant public static final androidx.ui.core.focus.FocusState Focused;
     enum_constant public static final androidx.ui.core.focus.FocusState NotFocusable;
     enum_constant public static final androidx.ui.core.focus.FocusState NotFocused;
@@ -1032,13 +1046,15 @@
   }
 
   public enum DelayUpMessage {
+    method public static androidx.ui.core.gesture.customevents.DelayUpMessage valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.gesture.customevents.DelayUpMessage[] values();
     enum_constant public static final androidx.ui.core.gesture.customevents.DelayUpMessage DelayUp;
     enum_constant public static final androidx.ui.core.gesture.customevents.DelayUpMessage DelayedUpConsumed;
     enum_constant public static final androidx.ui.core.gesture.customevents.DelayUpMessage DelayedUpNotConsumed;
   }
 
   public final class LongPressFiredEvent implements androidx.ui.core.CustomEvent {
-    field public static final androidx.ui.core.gesture.customevents.LongPressFiredEvent! INSTANCE;
+    field public static final androidx.ui.core.gesture.customevents.LongPressFiredEvent INSTANCE;
   }
 
 }
@@ -1067,6 +1083,8 @@
   }
 
   public enum HapticFeedbackType {
+    method public static androidx.ui.core.hapticfeedback.HapticFeedbackType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.hapticfeedback.HapticFeedbackType[] values();
     enum_constant public static final androidx.ui.core.hapticfeedback.HapticFeedbackType LongPress;
     enum_constant public static final androidx.ui.core.hapticfeedback.HapticFeedbackType TextHandleMove;
   }
@@ -1100,7 +1118,7 @@
     method public int getKeyCode();
     method public static inline int hashCode-impl(int p);
     method public static String toString-impl(int $this);
-    field public static final androidx.ui.core.keyinput.Key.Companion! Companion;
+    field public static final androidx.ui.core.keyinput.Key.Companion Companion;
   }
 
   public static final class Key.Companion {
@@ -1693,6 +1711,8 @@
   }
 
   public enum KeyEventType {
+    method public static androidx.ui.core.keyinput.KeyEventType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.keyinput.KeyEventType[] values();
     enum_constant public static final androidx.ui.core.keyinput.KeyEventType KeyDown;
     enum_constant public static final androidx.ui.core.keyinput.KeyEventType KeyUp;
   }
@@ -1862,7 +1882,7 @@
     property public final boolean isRoot;
     property public final androidx.ui.core.semantics.SemanticsNode? parent;
     property public final androidx.ui.unit.IntSize size;
-    field public static final androidx.ui.core.semantics.SemanticsNode.Companion! Companion;
+    field public static final androidx.ui.core.semantics.SemanticsNode.Companion Companion;
   }
 
   public static final class SemanticsNode.Companion {
@@ -1896,6 +1916,8 @@
   }
 
   public enum TextToolbarStatus {
+    method public static androidx.ui.core.texttoolbar.TextToolbarStatus valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.texttoolbar.TextToolbarStatus[] values();
     enum_constant public static final androidx.ui.core.texttoolbar.TextToolbarStatus Hidden;
     enum_constant public static final androidx.ui.core.texttoolbar.TextToolbarStatus Shown;
   }
@@ -2201,7 +2223,7 @@
     property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollForward;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollTo;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
-    field public static final androidx.ui.semantics.SemanticsActions! INSTANCE;
+    field public static final androidx.ui.semantics.SemanticsActions INSTANCE;
   }
 
   public final class SemanticsProperties {
@@ -2221,7 +2243,7 @@
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> IsPopup;
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> Text;
-    field public static final androidx.ui.semantics.SemanticsProperties! INSTANCE;
+    field public static final androidx.ui.semantics.SemanticsProperties INSTANCE;
   }
 
   public final class SemanticsPropertiesKt {
diff --git a/ui/ui-core/api/api_lint.ignore b/ui/ui-core/api/api_lint.ignore
index 158eb11..cecddb1 100644
--- a/ui/ui-core/api/api_lint.ignore
+++ b/ui/ui-core/api/api_lint.ignore
@@ -29,10 +29,6 @@
     Class should be named ScaleCallback
 
 
-ContextFirst: androidx.ui.core.WrapperKt#subcomposeInto(androidx.ui.core.LayoutNode, android.content.Context, androidx.compose.CompositionReference, kotlin.jvm.functions.Function0<kotlin.Unit>) parameter #1:
-    Context is distinct, so it must be the first argument (method `subcomposeInto`)
-
-
 MissingNullability: androidx.ui.core.Measured#constructor-impl(androidx.ui.core.Placeable):
     Missing nullability on method `constructor-impl` return
 MissingNullability: androidx.ui.core.Measured#equals-impl(androidx.ui.core.Placeable, Object) parameter #0:
diff --git a/ui/ui-core/api/current.txt b/ui/ui-core/api/current.txt
index e08d741..563f5bc 100644
--- a/ui/ui-core/api/current.txt
+++ b/ui/ui-core/api/current.txt
@@ -38,6 +38,8 @@
   }
 
   public enum AutofillType {
+    method public static androidx.ui.autofill.AutofillType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.autofill.AutofillType[] values();
     enum_constant public static final androidx.ui.autofill.AutofillType AddressAuxiliaryDetails;
     enum_constant public static final androidx.ui.autofill.AutofillType AddressCountry;
     enum_constant public static final androidx.ui.autofill.AutofillType AddressLocality;
@@ -84,7 +86,7 @@
   @androidx.compose.Immutable public final class AbsoluteAlignment implements androidx.ui.core.Alignment {
     method public androidx.ui.unit.IntOffset align(androidx.ui.unit.IntSize size, androidx.ui.core.LayoutDirection layoutDirection);
     method @androidx.compose.Immutable public androidx.ui.core.AbsoluteAlignment copy(float verticalBias, float horizontalBias);
-    field public static final androidx.ui.core.AbsoluteAlignment.Companion! Companion;
+    field public static final androidx.ui.core.AbsoluteAlignment.Companion Companion;
   }
 
   public static final class AbsoluteAlignment.Companion {
@@ -113,7 +115,7 @@
 
   @androidx.compose.Immutable public interface Alignment {
     method public androidx.ui.unit.IntOffset align(androidx.ui.unit.IntSize size, androidx.ui.core.LayoutDirection layoutDirection = LayoutDirection.Ltr);
-    field public static final androidx.ui.core.Alignment.Companion! Companion;
+    field public static final androidx.ui.core.Alignment.Companion Companion;
   }
 
   public static final class Alignment.Companion {
@@ -158,7 +160,7 @@
   }
 
   @androidx.compose.Immutable public abstract sealed class AlignmentLine {
-    field public static final androidx.ui.core.AlignmentLine.Companion! Companion;
+    field public static final androidx.ui.core.AlignmentLine.Companion Companion;
     field public static final int Unspecified = -2147483648; // 0x80000000
   }
 
@@ -248,7 +250,7 @@
 
   @androidx.compose.Stable public interface ContentScale {
     method public float scale(androidx.ui.geometry.Size srcSize, androidx.ui.geometry.Size dstSize);
-    field public static final androidx.ui.core.ContentScale.Companion! Companion;
+    field public static final androidx.ui.core.ContentScale.Companion Companion;
   }
 
   public static final class ContentScale.Companion {
@@ -282,6 +284,8 @@
   }
 
   public enum Direction {
+    method public static androidx.ui.core.Direction valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.Direction[] values();
     enum_constant public static final androidx.ui.core.Direction DOWN;
     enum_constant public static final androidx.ui.core.Direction LEFT;
     enum_constant public static final androidx.ui.core.Direction RIGHT;
@@ -334,6 +338,8 @@
   }
 
   public enum DropDownAlignment {
+    method public static androidx.ui.core.DropDownAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.DropDownAlignment[] values();
     enum_constant public static final androidx.ui.core.DropDownAlignment End;
     enum_constant public static final androidx.ui.core.DropDownAlignment Start;
   }
@@ -491,6 +497,8 @@
   }
 
   public enum LayoutNode.LayoutState {
+    method public static androidx.ui.core.LayoutNode.LayoutState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.LayoutNode.LayoutState[] values();
     enum_constant public static final androidx.ui.core.LayoutNode.LayoutState LayingOut;
     enum_constant public static final androidx.ui.core.LayoutNode.LayoutState Measuring;
     enum_constant public static final androidx.ui.core.LayoutNode.LayoutState NeedsRelayout;
@@ -572,7 +580,7 @@
     method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
     method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
     method public default operator androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
-    field public static final androidx.ui.core.Modifier.Companion! Companion;
+    field public static final androidx.ui.core.Modifier.Companion Companion;
   }
 
   public static final class Modifier.Companion implements androidx.ui.core.Modifier {
@@ -672,7 +680,7 @@
     property public abstract boolean showLayoutBounds;
     property public abstract androidx.ui.input.TextInputService textInputService;
     property public abstract androidx.ui.core.texttoolbar.TextToolbar textToolbar;
-    field public static final androidx.ui.core.Owner.Companion! Companion;
+    field public static final androidx.ui.core.Owner.Companion Companion;
   }
 
   public static final class Owner.Companion {
@@ -722,6 +730,8 @@
   }
 
   public enum PointerEventPass {
+    method public static androidx.ui.core.PointerEventPass valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.PointerEventPass[] values();
     enum_constant public static final androidx.ui.core.PointerEventPass InitialDown;
     enum_constant public static final androidx.ui.core.PointerEventPass PostDown;
     enum_constant public static final androidx.ui.core.PointerEventPass PostUp;
@@ -813,7 +823,7 @@
     method public static float getPivotFractionY-impl(long $this);
     method @androidx.compose.Immutable public static inline int hashCode-impl(long p);
     method @androidx.compose.Immutable public static inline String! toString-impl(long p);
-    field public static final androidx.ui.core.TransformOrigin.Companion! Companion;
+    field public static final androidx.ui.core.TransformOrigin.Companion Companion;
   }
 
   public static final class TransformOrigin.Companion {
@@ -876,6 +886,8 @@
 package androidx.ui.core.focus {
 
   public enum FocusDetailedState {
+    method public static androidx.ui.core.focus.FocusDetailedState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.focus.FocusDetailedState[] values();
     enum_constant public static final androidx.ui.core.focus.FocusDetailedState Active;
     enum_constant public static final androidx.ui.core.focus.FocusDetailedState ActiveParent;
     enum_constant public static final androidx.ui.core.focus.FocusDetailedState Captured;
@@ -900,6 +912,8 @@
   }
 
   public enum FocusState {
+    method public static androidx.ui.core.focus.FocusState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.focus.FocusState[] values();
     enum_constant public static final androidx.ui.core.focus.FocusState Focused;
     enum_constant public static final androidx.ui.core.focus.FocusState NotFocusable;
     enum_constant public static final androidx.ui.core.focus.FocusState NotFocused;
@@ -1032,13 +1046,15 @@
   }
 
   public enum DelayUpMessage {
+    method public static androidx.ui.core.gesture.customevents.DelayUpMessage valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.gesture.customevents.DelayUpMessage[] values();
     enum_constant public static final androidx.ui.core.gesture.customevents.DelayUpMessage DelayUp;
     enum_constant public static final androidx.ui.core.gesture.customevents.DelayUpMessage DelayedUpConsumed;
     enum_constant public static final androidx.ui.core.gesture.customevents.DelayUpMessage DelayedUpNotConsumed;
   }
 
   public final class LongPressFiredEvent implements androidx.ui.core.CustomEvent {
-    field public static final androidx.ui.core.gesture.customevents.LongPressFiredEvent! INSTANCE;
+    field public static final androidx.ui.core.gesture.customevents.LongPressFiredEvent INSTANCE;
   }
 
 }
@@ -1067,6 +1083,8 @@
   }
 
   public enum HapticFeedbackType {
+    method public static androidx.ui.core.hapticfeedback.HapticFeedbackType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.hapticfeedback.HapticFeedbackType[] values();
     enum_constant public static final androidx.ui.core.hapticfeedback.HapticFeedbackType LongPress;
     enum_constant public static final androidx.ui.core.hapticfeedback.HapticFeedbackType TextHandleMove;
   }
@@ -1100,7 +1118,7 @@
     method public int getKeyCode();
     method public static inline int hashCode-impl(int p);
     method public static String toString-impl(int $this);
-    field public static final androidx.ui.core.keyinput.Key.Companion! Companion;
+    field public static final androidx.ui.core.keyinput.Key.Companion Companion;
   }
 
   public static final class Key.Companion {
@@ -1693,6 +1711,8 @@
   }
 
   public enum KeyEventType {
+    method public static androidx.ui.core.keyinput.KeyEventType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.keyinput.KeyEventType[] values();
     enum_constant public static final androidx.ui.core.keyinput.KeyEventType KeyDown;
     enum_constant public static final androidx.ui.core.keyinput.KeyEventType KeyUp;
   }
@@ -1862,7 +1882,7 @@
     property public final boolean isRoot;
     property public final androidx.ui.core.semantics.SemanticsNode? parent;
     property public final androidx.ui.unit.IntSize size;
-    field public static final androidx.ui.core.semantics.SemanticsNode.Companion! Companion;
+    field public static final androidx.ui.core.semantics.SemanticsNode.Companion Companion;
   }
 
   public static final class SemanticsNode.Companion {
@@ -1896,6 +1916,8 @@
   }
 
   public enum TextToolbarStatus {
+    method public static androidx.ui.core.texttoolbar.TextToolbarStatus valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.texttoolbar.TextToolbarStatus[] values();
     enum_constant public static final androidx.ui.core.texttoolbar.TextToolbarStatus Hidden;
     enum_constant public static final androidx.ui.core.texttoolbar.TextToolbarStatus Shown;
   }
@@ -2201,7 +2223,7 @@
     property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollForward;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollTo;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
-    field public static final androidx.ui.semantics.SemanticsActions! INSTANCE;
+    field public static final androidx.ui.semantics.SemanticsActions INSTANCE;
   }
 
   public final class SemanticsProperties {
@@ -2221,7 +2243,7 @@
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> IsPopup;
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> Text;
-    field public static final androidx.ui.semantics.SemanticsProperties! INSTANCE;
+    field public static final androidx.ui.semantics.SemanticsProperties INSTANCE;
   }
 
   public final class SemanticsPropertiesKt {
diff --git a/ui/ui-core/api/public_plus_experimental_0.1.0-dev15.txt b/ui/ui-core/api/public_plus_experimental_0.1.0-dev15.txt
index d5ea872..79f178f 100644
--- a/ui/ui-core/api/public_plus_experimental_0.1.0-dev15.txt
+++ b/ui/ui-core/api/public_plus_experimental_0.1.0-dev15.txt
@@ -38,6 +38,8 @@
   }
 
   public enum AutofillType {
+    method public static androidx.ui.autofill.AutofillType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.autofill.AutofillType[] values();
     enum_constant public static final androidx.ui.autofill.AutofillType AddressAuxiliaryDetails;
     enum_constant public static final androidx.ui.autofill.AutofillType AddressCountry;
     enum_constant public static final androidx.ui.autofill.AutofillType AddressLocality;
@@ -84,7 +86,7 @@
   @androidx.compose.Immutable public final class AbsoluteAlignment implements androidx.ui.core.Alignment {
     method public androidx.ui.unit.IntOffset align(androidx.ui.unit.IntSize size, androidx.ui.core.LayoutDirection layoutDirection);
     method @androidx.compose.Immutable public androidx.ui.core.AbsoluteAlignment copy(float verticalBias, float horizontalBias);
-    field public static final androidx.ui.core.AbsoluteAlignment.Companion! Companion;
+    field public static final androidx.ui.core.AbsoluteAlignment.Companion Companion;
   }
 
   public static final class AbsoluteAlignment.Companion {
@@ -113,7 +115,7 @@
 
   @androidx.compose.Immutable public interface Alignment {
     method public androidx.ui.unit.IntOffset align(androidx.ui.unit.IntSize size, androidx.ui.core.LayoutDirection layoutDirection = LayoutDirection.Ltr);
-    field public static final androidx.ui.core.Alignment.Companion! Companion;
+    field public static final androidx.ui.core.Alignment.Companion Companion;
   }
 
   public static final class Alignment.Companion {
@@ -158,7 +160,7 @@
   }
 
   @androidx.compose.Immutable public abstract sealed class AlignmentLine {
-    field public static final androidx.ui.core.AlignmentLine.Companion! Companion;
+    field public static final androidx.ui.core.AlignmentLine.Companion Companion;
     field public static final int Unspecified = -2147483648; // 0x80000000
   }
 
@@ -248,7 +250,7 @@
 
   @androidx.compose.Stable public interface ContentScale {
     method public float scale(androidx.ui.geometry.Size srcSize, androidx.ui.geometry.Size dstSize);
-    field public static final androidx.ui.core.ContentScale.Companion! Companion;
+    field public static final androidx.ui.core.ContentScale.Companion Companion;
   }
 
   public static final class ContentScale.Companion {
@@ -283,6 +285,8 @@
   }
 
   public enum Direction {
+    method public static androidx.ui.core.Direction valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.Direction[] values();
     enum_constant public static final androidx.ui.core.Direction DOWN;
     enum_constant public static final androidx.ui.core.Direction LEFT;
     enum_constant public static final androidx.ui.core.Direction RIGHT;
@@ -335,6 +339,8 @@
   }
 
   public enum DropDownAlignment {
+    method public static androidx.ui.core.DropDownAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.DropDownAlignment[] values();
     enum_constant public static final androidx.ui.core.DropDownAlignment End;
     enum_constant public static final androidx.ui.core.DropDownAlignment Start;
   }
@@ -492,6 +498,8 @@
   }
 
   public enum LayoutNode.LayoutState {
+    method public static androidx.ui.core.LayoutNode.LayoutState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.LayoutNode.LayoutState[] values();
     enum_constant public static final androidx.ui.core.LayoutNode.LayoutState LayingOut;
     enum_constant public static final androidx.ui.core.LayoutNode.LayoutState Measuring;
     enum_constant public static final androidx.ui.core.LayoutNode.LayoutState NeedsRelayout;
@@ -573,7 +581,7 @@
     method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
     method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
     method public default operator androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
-    field public static final androidx.ui.core.Modifier.Companion! Companion;
+    field public static final androidx.ui.core.Modifier.Companion Companion;
   }
 
   public static final class Modifier.Companion implements androidx.ui.core.Modifier {
@@ -674,7 +682,7 @@
     property public abstract boolean showLayoutBounds;
     property public abstract androidx.ui.input.TextInputService textInputService;
     property public abstract androidx.ui.core.texttoolbar.TextToolbar textToolbar;
-    field public static final androidx.ui.core.Owner.Companion! Companion;
+    field public static final androidx.ui.core.Owner.Companion Companion;
   }
 
   public static final class Owner.Companion {
@@ -724,6 +732,8 @@
   }
 
   public enum PointerEventPass {
+    method public static androidx.ui.core.PointerEventPass valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.PointerEventPass[] values();
     enum_constant public static final androidx.ui.core.PointerEventPass InitialDown;
     enum_constant public static final androidx.ui.core.PointerEventPass PostDown;
     enum_constant public static final androidx.ui.core.PointerEventPass PostUp;
@@ -815,7 +825,7 @@
     method public static float getPivotFractionY-impl(long $this);
     method @androidx.compose.Immutable public static inline int hashCode-impl(long p);
     method @androidx.compose.Immutable public static inline String! toString-impl(long p);
-    field public static final androidx.ui.core.TransformOrigin.Companion! Companion;
+    field public static final androidx.ui.core.TransformOrigin.Companion Companion;
   }
 
   public static final class TransformOrigin.Companion {
@@ -878,6 +888,8 @@
 package androidx.ui.core.focus {
 
   public enum FocusDetailedState {
+    method public static androidx.ui.core.focus.FocusDetailedState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.focus.FocusDetailedState[] values();
     enum_constant public static final androidx.ui.core.focus.FocusDetailedState Active;
     enum_constant public static final androidx.ui.core.focus.FocusDetailedState ActiveParent;
     enum_constant public static final androidx.ui.core.focus.FocusDetailedState Captured;
@@ -902,6 +914,8 @@
   }
 
   public enum FocusState {
+    method public static androidx.ui.core.focus.FocusState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.focus.FocusState[] values();
     enum_constant public static final androidx.ui.core.focus.FocusState Focused;
     enum_constant public static final androidx.ui.core.focus.FocusState NotFocusable;
     enum_constant public static final androidx.ui.core.focus.FocusState NotFocused;
@@ -1034,13 +1048,15 @@
   }
 
   public enum DelayUpMessage {
+    method public static androidx.ui.core.gesture.customevents.DelayUpMessage valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.gesture.customevents.DelayUpMessage[] values();
     enum_constant public static final androidx.ui.core.gesture.customevents.DelayUpMessage DelayUp;
     enum_constant public static final androidx.ui.core.gesture.customevents.DelayUpMessage DelayedUpConsumed;
     enum_constant public static final androidx.ui.core.gesture.customevents.DelayUpMessage DelayedUpNotConsumed;
   }
 
   public final class LongPressFiredEvent implements androidx.ui.core.CustomEvent {
-    field public static final androidx.ui.core.gesture.customevents.LongPressFiredEvent! INSTANCE;
+    field public static final androidx.ui.core.gesture.customevents.LongPressFiredEvent INSTANCE;
   }
 
 }
@@ -1069,6 +1085,8 @@
   }
 
   public enum HapticFeedbackType {
+    method public static androidx.ui.core.hapticfeedback.HapticFeedbackType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.hapticfeedback.HapticFeedbackType[] values();
     enum_constant public static final androidx.ui.core.hapticfeedback.HapticFeedbackType LongPress;
     enum_constant public static final androidx.ui.core.hapticfeedback.HapticFeedbackType TextHandleMove;
   }
@@ -1102,7 +1120,7 @@
     method public int getKeyCode();
     method public static inline int hashCode-impl(int p);
     method public static String toString-impl(int $this);
-    field public static final androidx.ui.core.keyinput.Key.Companion! Companion;
+    field public static final androidx.ui.core.keyinput.Key.Companion Companion;
   }
 
   public static final class Key.Companion {
@@ -1695,6 +1713,8 @@
   }
 
   public enum KeyEventType {
+    method public static androidx.ui.core.keyinput.KeyEventType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.keyinput.KeyEventType[] values();
     enum_constant public static final androidx.ui.core.keyinput.KeyEventType KeyDown;
     enum_constant public static final androidx.ui.core.keyinput.KeyEventType KeyUp;
   }
@@ -1864,7 +1884,7 @@
     property public final boolean isRoot;
     property public final androidx.ui.core.semantics.SemanticsNode? parent;
     property public final androidx.ui.unit.IntSize size;
-    field public static final androidx.ui.core.semantics.SemanticsNode.Companion! Companion;
+    field public static final androidx.ui.core.semantics.SemanticsNode.Companion Companion;
   }
 
   public static final class SemanticsNode.Companion {
@@ -1898,6 +1918,8 @@
   }
 
   public enum TextToolbarStatus {
+    method public static androidx.ui.core.texttoolbar.TextToolbarStatus valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.texttoolbar.TextToolbarStatus[] values();
     enum_constant public static final androidx.ui.core.texttoolbar.TextToolbarStatus Hidden;
     enum_constant public static final androidx.ui.core.texttoolbar.TextToolbarStatus Shown;
   }
@@ -2203,7 +2225,7 @@
     property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollForward;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollTo;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
-    field public static final androidx.ui.semantics.SemanticsActions! INSTANCE;
+    field public static final androidx.ui.semantics.SemanticsActions INSTANCE;
   }
 
   public final class SemanticsProperties {
@@ -2223,7 +2245,7 @@
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> IsPopup;
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> Text;
-    field public static final androidx.ui.semantics.SemanticsProperties! INSTANCE;
+    field public static final androidx.ui.semantics.SemanticsProperties INSTANCE;
   }
 
   public final class SemanticsPropertiesKt {
diff --git a/ui/ui-core/api/public_plus_experimental_current.txt b/ui/ui-core/api/public_plus_experimental_current.txt
index d5ea872..79f178f 100644
--- a/ui/ui-core/api/public_plus_experimental_current.txt
+++ b/ui/ui-core/api/public_plus_experimental_current.txt
@@ -38,6 +38,8 @@
   }
 
   public enum AutofillType {
+    method public static androidx.ui.autofill.AutofillType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.autofill.AutofillType[] values();
     enum_constant public static final androidx.ui.autofill.AutofillType AddressAuxiliaryDetails;
     enum_constant public static final androidx.ui.autofill.AutofillType AddressCountry;
     enum_constant public static final androidx.ui.autofill.AutofillType AddressLocality;
@@ -84,7 +86,7 @@
   @androidx.compose.Immutable public final class AbsoluteAlignment implements androidx.ui.core.Alignment {
     method public androidx.ui.unit.IntOffset align(androidx.ui.unit.IntSize size, androidx.ui.core.LayoutDirection layoutDirection);
     method @androidx.compose.Immutable public androidx.ui.core.AbsoluteAlignment copy(float verticalBias, float horizontalBias);
-    field public static final androidx.ui.core.AbsoluteAlignment.Companion! Companion;
+    field public static final androidx.ui.core.AbsoluteAlignment.Companion Companion;
   }
 
   public static final class AbsoluteAlignment.Companion {
@@ -113,7 +115,7 @@
 
   @androidx.compose.Immutable public interface Alignment {
     method public androidx.ui.unit.IntOffset align(androidx.ui.unit.IntSize size, androidx.ui.core.LayoutDirection layoutDirection = LayoutDirection.Ltr);
-    field public static final androidx.ui.core.Alignment.Companion! Companion;
+    field public static final androidx.ui.core.Alignment.Companion Companion;
   }
 
   public static final class Alignment.Companion {
@@ -158,7 +160,7 @@
   }
 
   @androidx.compose.Immutable public abstract sealed class AlignmentLine {
-    field public static final androidx.ui.core.AlignmentLine.Companion! Companion;
+    field public static final androidx.ui.core.AlignmentLine.Companion Companion;
     field public static final int Unspecified = -2147483648; // 0x80000000
   }
 
@@ -248,7 +250,7 @@
 
   @androidx.compose.Stable public interface ContentScale {
     method public float scale(androidx.ui.geometry.Size srcSize, androidx.ui.geometry.Size dstSize);
-    field public static final androidx.ui.core.ContentScale.Companion! Companion;
+    field public static final androidx.ui.core.ContentScale.Companion Companion;
   }
 
   public static final class ContentScale.Companion {
@@ -283,6 +285,8 @@
   }
 
   public enum Direction {
+    method public static androidx.ui.core.Direction valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.Direction[] values();
     enum_constant public static final androidx.ui.core.Direction DOWN;
     enum_constant public static final androidx.ui.core.Direction LEFT;
     enum_constant public static final androidx.ui.core.Direction RIGHT;
@@ -335,6 +339,8 @@
   }
 
   public enum DropDownAlignment {
+    method public static androidx.ui.core.DropDownAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.DropDownAlignment[] values();
     enum_constant public static final androidx.ui.core.DropDownAlignment End;
     enum_constant public static final androidx.ui.core.DropDownAlignment Start;
   }
@@ -492,6 +498,8 @@
   }
 
   public enum LayoutNode.LayoutState {
+    method public static androidx.ui.core.LayoutNode.LayoutState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.LayoutNode.LayoutState[] values();
     enum_constant public static final androidx.ui.core.LayoutNode.LayoutState LayingOut;
     enum_constant public static final androidx.ui.core.LayoutNode.LayoutState Measuring;
     enum_constant public static final androidx.ui.core.LayoutNode.LayoutState NeedsRelayout;
@@ -573,7 +581,7 @@
     method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
     method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
     method public default operator androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
-    field public static final androidx.ui.core.Modifier.Companion! Companion;
+    field public static final androidx.ui.core.Modifier.Companion Companion;
   }
 
   public static final class Modifier.Companion implements androidx.ui.core.Modifier {
@@ -674,7 +682,7 @@
     property public abstract boolean showLayoutBounds;
     property public abstract androidx.ui.input.TextInputService textInputService;
     property public abstract androidx.ui.core.texttoolbar.TextToolbar textToolbar;
-    field public static final androidx.ui.core.Owner.Companion! Companion;
+    field public static final androidx.ui.core.Owner.Companion Companion;
   }
 
   public static final class Owner.Companion {
@@ -724,6 +732,8 @@
   }
 
   public enum PointerEventPass {
+    method public static androidx.ui.core.PointerEventPass valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.PointerEventPass[] values();
     enum_constant public static final androidx.ui.core.PointerEventPass InitialDown;
     enum_constant public static final androidx.ui.core.PointerEventPass PostDown;
     enum_constant public static final androidx.ui.core.PointerEventPass PostUp;
@@ -815,7 +825,7 @@
     method public static float getPivotFractionY-impl(long $this);
     method @androidx.compose.Immutable public static inline int hashCode-impl(long p);
     method @androidx.compose.Immutable public static inline String! toString-impl(long p);
-    field public static final androidx.ui.core.TransformOrigin.Companion! Companion;
+    field public static final androidx.ui.core.TransformOrigin.Companion Companion;
   }
 
   public static final class TransformOrigin.Companion {
@@ -878,6 +888,8 @@
 package androidx.ui.core.focus {
 
   public enum FocusDetailedState {
+    method public static androidx.ui.core.focus.FocusDetailedState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.focus.FocusDetailedState[] values();
     enum_constant public static final androidx.ui.core.focus.FocusDetailedState Active;
     enum_constant public static final androidx.ui.core.focus.FocusDetailedState ActiveParent;
     enum_constant public static final androidx.ui.core.focus.FocusDetailedState Captured;
@@ -902,6 +914,8 @@
   }
 
   public enum FocusState {
+    method public static androidx.ui.core.focus.FocusState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.focus.FocusState[] values();
     enum_constant public static final androidx.ui.core.focus.FocusState Focused;
     enum_constant public static final androidx.ui.core.focus.FocusState NotFocusable;
     enum_constant public static final androidx.ui.core.focus.FocusState NotFocused;
@@ -1034,13 +1048,15 @@
   }
 
   public enum DelayUpMessage {
+    method public static androidx.ui.core.gesture.customevents.DelayUpMessage valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.gesture.customevents.DelayUpMessage[] values();
     enum_constant public static final androidx.ui.core.gesture.customevents.DelayUpMessage DelayUp;
     enum_constant public static final androidx.ui.core.gesture.customevents.DelayUpMessage DelayedUpConsumed;
     enum_constant public static final androidx.ui.core.gesture.customevents.DelayUpMessage DelayedUpNotConsumed;
   }
 
   public final class LongPressFiredEvent implements androidx.ui.core.CustomEvent {
-    field public static final androidx.ui.core.gesture.customevents.LongPressFiredEvent! INSTANCE;
+    field public static final androidx.ui.core.gesture.customevents.LongPressFiredEvent INSTANCE;
   }
 
 }
@@ -1069,6 +1085,8 @@
   }
 
   public enum HapticFeedbackType {
+    method public static androidx.ui.core.hapticfeedback.HapticFeedbackType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.hapticfeedback.HapticFeedbackType[] values();
     enum_constant public static final androidx.ui.core.hapticfeedback.HapticFeedbackType LongPress;
     enum_constant public static final androidx.ui.core.hapticfeedback.HapticFeedbackType TextHandleMove;
   }
@@ -1102,7 +1120,7 @@
     method public int getKeyCode();
     method public static inline int hashCode-impl(int p);
     method public static String toString-impl(int $this);
-    field public static final androidx.ui.core.keyinput.Key.Companion! Companion;
+    field public static final androidx.ui.core.keyinput.Key.Companion Companion;
   }
 
   public static final class Key.Companion {
@@ -1695,6 +1713,8 @@
   }
 
   public enum KeyEventType {
+    method public static androidx.ui.core.keyinput.KeyEventType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.keyinput.KeyEventType[] values();
     enum_constant public static final androidx.ui.core.keyinput.KeyEventType KeyDown;
     enum_constant public static final androidx.ui.core.keyinput.KeyEventType KeyUp;
   }
@@ -1864,7 +1884,7 @@
     property public final boolean isRoot;
     property public final androidx.ui.core.semantics.SemanticsNode? parent;
     property public final androidx.ui.unit.IntSize size;
-    field public static final androidx.ui.core.semantics.SemanticsNode.Companion! Companion;
+    field public static final androidx.ui.core.semantics.SemanticsNode.Companion Companion;
   }
 
   public static final class SemanticsNode.Companion {
@@ -1898,6 +1918,8 @@
   }
 
   public enum TextToolbarStatus {
+    method public static androidx.ui.core.texttoolbar.TextToolbarStatus valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.texttoolbar.TextToolbarStatus[] values();
     enum_constant public static final androidx.ui.core.texttoolbar.TextToolbarStatus Hidden;
     enum_constant public static final androidx.ui.core.texttoolbar.TextToolbarStatus Shown;
   }
@@ -2203,7 +2225,7 @@
     property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollForward;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollTo;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
-    field public static final androidx.ui.semantics.SemanticsActions! INSTANCE;
+    field public static final androidx.ui.semantics.SemanticsActions INSTANCE;
   }
 
   public final class SemanticsProperties {
@@ -2223,7 +2245,7 @@
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> IsPopup;
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> Text;
-    field public static final androidx.ui.semantics.SemanticsProperties! INSTANCE;
+    field public static final androidx.ui.semantics.SemanticsProperties INSTANCE;
   }
 
   public final class SemanticsPropertiesKt {
diff --git a/ui/ui-core/api/restricted_0.1.0-dev15.txt b/ui/ui-core/api/restricted_0.1.0-dev15.txt
index 44591d2..d67f858 100644
--- a/ui/ui-core/api/restricted_0.1.0-dev15.txt
+++ b/ui/ui-core/api/restricted_0.1.0-dev15.txt
@@ -38,6 +38,8 @@
   }
 
   public enum AutofillType {
+    method public static androidx.ui.autofill.AutofillType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.autofill.AutofillType[] values();
     enum_constant public static final androidx.ui.autofill.AutofillType AddressAuxiliaryDetails;
     enum_constant public static final androidx.ui.autofill.AutofillType AddressCountry;
     enum_constant public static final androidx.ui.autofill.AutofillType AddressLocality;
@@ -84,7 +86,7 @@
   @androidx.compose.Immutable public final class AbsoluteAlignment implements androidx.ui.core.Alignment {
     method public androidx.ui.unit.IntOffset align(androidx.ui.unit.IntSize size, androidx.ui.core.LayoutDirection layoutDirection);
     method @androidx.compose.Immutable public androidx.ui.core.AbsoluteAlignment copy(float verticalBias, float horizontalBias);
-    field public static final androidx.ui.core.AbsoluteAlignment.Companion! Companion;
+    field public static final androidx.ui.core.AbsoluteAlignment.Companion Companion;
   }
 
   public static final class AbsoluteAlignment.Companion {
@@ -113,7 +115,7 @@
 
   @androidx.compose.Immutable public interface Alignment {
     method public androidx.ui.unit.IntOffset align(androidx.ui.unit.IntSize size, androidx.ui.core.LayoutDirection layoutDirection = LayoutDirection.Ltr);
-    field public static final androidx.ui.core.Alignment.Companion! Companion;
+    field public static final androidx.ui.core.Alignment.Companion Companion;
   }
 
   public static final class Alignment.Companion {
@@ -158,7 +160,7 @@
   }
 
   @androidx.compose.Immutable public abstract sealed class AlignmentLine {
-    field public static final androidx.ui.core.AlignmentLine.Companion! Companion;
+    field public static final androidx.ui.core.AlignmentLine.Companion Companion;
     field public static final int Unspecified = -2147483648; // 0x80000000
   }
 
@@ -254,7 +256,7 @@
 
   @androidx.compose.Stable public interface ContentScale {
     method public float scale(androidx.ui.geometry.Size srcSize, androidx.ui.geometry.Size dstSize);
-    field public static final androidx.ui.core.ContentScale.Companion! Companion;
+    field public static final androidx.ui.core.ContentScale.Companion Companion;
   }
 
   public static final class ContentScale.Companion {
@@ -303,6 +305,8 @@
   }
 
   public enum Direction {
+    method public static androidx.ui.core.Direction valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.Direction[] values();
     enum_constant public static final androidx.ui.core.Direction DOWN;
     enum_constant public static final androidx.ui.core.Direction LEFT;
     enum_constant public static final androidx.ui.core.Direction RIGHT;
@@ -355,6 +359,8 @@
   }
 
   public enum DropDownAlignment {
+    method public static androidx.ui.core.DropDownAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.DropDownAlignment[] values();
     enum_constant public static final androidx.ui.core.DropDownAlignment End;
     enum_constant public static final androidx.ui.core.DropDownAlignment Start;
   }
@@ -394,11 +400,15 @@
   }
 
   @kotlin.PublishedApi internal enum IntrinsicMinMax {
+    method public static androidx.ui.core.IntrinsicMinMax valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.IntrinsicMinMax[] values();
     enum_constant public static final androidx.ui.core.IntrinsicMinMax Max;
     enum_constant public static final androidx.ui.core.IntrinsicMinMax Min;
   }
 
   @kotlin.PublishedApi internal enum IntrinsicWidthHeight {
+    method public static androidx.ui.core.IntrinsicWidthHeight valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.IntrinsicWidthHeight[] values();
     enum_constant public static final androidx.ui.core.IntrinsicWidthHeight Height;
     enum_constant public static final androidx.ui.core.IntrinsicWidthHeight Width;
   }
@@ -540,6 +550,8 @@
   }
 
   public enum LayoutNode.LayoutState {
+    method public static androidx.ui.core.LayoutNode.LayoutState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.LayoutNode.LayoutState[] values();
     enum_constant public static final androidx.ui.core.LayoutNode.LayoutState LayingOut;
     enum_constant public static final androidx.ui.core.LayoutNode.LayoutState Measuring;
     enum_constant public static final androidx.ui.core.LayoutNode.LayoutState NeedsRelayout;
@@ -623,7 +635,7 @@
     method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
     method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
     method public default operator androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
-    field public static final androidx.ui.core.Modifier.Companion! Companion;
+    field public static final androidx.ui.core.Modifier.Companion Companion;
   }
 
   public static final class Modifier.Companion implements androidx.ui.core.Modifier {
@@ -724,7 +736,7 @@
     property public abstract boolean showLayoutBounds;
     property public abstract androidx.ui.input.TextInputService textInputService;
     property public abstract androidx.ui.core.texttoolbar.TextToolbar textToolbar;
-    field public static final androidx.ui.core.Owner.Companion! Companion;
+    field public static final androidx.ui.core.Owner.Companion Companion;
   }
 
   public static final class Owner.Companion {
@@ -774,6 +786,8 @@
   }
 
   public enum PointerEventPass {
+    method public static androidx.ui.core.PointerEventPass valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.PointerEventPass[] values();
     enum_constant public static final androidx.ui.core.PointerEventPass InitialDown;
     enum_constant public static final androidx.ui.core.PointerEventPass PostDown;
     enum_constant public static final androidx.ui.core.PointerEventPass PostUp;
@@ -865,7 +879,7 @@
     method public static float getPivotFractionY-impl(long $this);
     method @androidx.compose.Immutable public static inline int hashCode-impl(long p);
     method @androidx.compose.Immutable public static inline String! toString-impl(long p);
-    field public static final androidx.ui.core.TransformOrigin.Companion! Companion;
+    field public static final androidx.ui.core.TransformOrigin.Companion Companion;
   }
 
   public static final class TransformOrigin.Companion {
@@ -928,6 +942,8 @@
 package androidx.ui.core.focus {
 
   public enum FocusDetailedState {
+    method public static androidx.ui.core.focus.FocusDetailedState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.focus.FocusDetailedState[] values();
     enum_constant public static final androidx.ui.core.focus.FocusDetailedState Active;
     enum_constant public static final androidx.ui.core.focus.FocusDetailedState ActiveParent;
     enum_constant public static final androidx.ui.core.focus.FocusDetailedState Captured;
@@ -952,6 +968,8 @@
   }
 
   public enum FocusState {
+    method public static androidx.ui.core.focus.FocusState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.focus.FocusState[] values();
     enum_constant public static final androidx.ui.core.focus.FocusState Focused;
     enum_constant public static final androidx.ui.core.focus.FocusState NotFocusable;
     enum_constant public static final androidx.ui.core.focus.FocusState NotFocused;
@@ -1084,13 +1102,15 @@
   }
 
   public enum DelayUpMessage {
+    method public static androidx.ui.core.gesture.customevents.DelayUpMessage valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.gesture.customevents.DelayUpMessage[] values();
     enum_constant public static final androidx.ui.core.gesture.customevents.DelayUpMessage DelayUp;
     enum_constant public static final androidx.ui.core.gesture.customevents.DelayUpMessage DelayedUpConsumed;
     enum_constant public static final androidx.ui.core.gesture.customevents.DelayUpMessage DelayedUpNotConsumed;
   }
 
   public final class LongPressFiredEvent implements androidx.ui.core.CustomEvent {
-    field public static final androidx.ui.core.gesture.customevents.LongPressFiredEvent! INSTANCE;
+    field public static final androidx.ui.core.gesture.customevents.LongPressFiredEvent INSTANCE;
   }
 
 }
@@ -1119,6 +1139,8 @@
   }
 
   public enum HapticFeedbackType {
+    method public static androidx.ui.core.hapticfeedback.HapticFeedbackType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.hapticfeedback.HapticFeedbackType[] values();
     enum_constant public static final androidx.ui.core.hapticfeedback.HapticFeedbackType LongPress;
     enum_constant public static final androidx.ui.core.hapticfeedback.HapticFeedbackType TextHandleMove;
   }
@@ -1152,7 +1174,7 @@
     method public int getKeyCode();
     method public static inline int hashCode-impl(int p);
     method public static String toString-impl(int $this);
-    field public static final androidx.ui.core.keyinput.Key.Companion! Companion;
+    field public static final androidx.ui.core.keyinput.Key.Companion Companion;
   }
 
   public static final class Key.Companion {
@@ -1745,6 +1767,8 @@
   }
 
   public enum KeyEventType {
+    method public static androidx.ui.core.keyinput.KeyEventType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.keyinput.KeyEventType[] values();
     enum_constant public static final androidx.ui.core.keyinput.KeyEventType KeyDown;
     enum_constant public static final androidx.ui.core.keyinput.KeyEventType KeyUp;
   }
@@ -1914,7 +1938,7 @@
     property public final boolean isRoot;
     property public final androidx.ui.core.semantics.SemanticsNode? parent;
     property public final androidx.ui.unit.IntSize size;
-    field public static final androidx.ui.core.semantics.SemanticsNode.Companion! Companion;
+    field public static final androidx.ui.core.semantics.SemanticsNode.Companion Companion;
   }
 
   public static final class SemanticsNode.Companion {
@@ -1948,6 +1972,8 @@
   }
 
   public enum TextToolbarStatus {
+    method public static androidx.ui.core.texttoolbar.TextToolbarStatus valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.texttoolbar.TextToolbarStatus[] values();
     enum_constant public static final androidx.ui.core.texttoolbar.TextToolbarStatus Hidden;
     enum_constant public static final androidx.ui.core.texttoolbar.TextToolbarStatus Shown;
   }
@@ -2262,7 +2288,7 @@
     property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollForward;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollTo;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
-    field public static final androidx.ui.semantics.SemanticsActions! INSTANCE;
+    field public static final androidx.ui.semantics.SemanticsActions INSTANCE;
   }
 
   public final class SemanticsProperties {
@@ -2282,7 +2308,7 @@
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> IsPopup;
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> Text;
-    field public static final androidx.ui.semantics.SemanticsProperties! INSTANCE;
+    field public static final androidx.ui.semantics.SemanticsProperties INSTANCE;
   }
 
   public final class SemanticsPropertiesKt {
diff --git a/ui/ui-core/api/restricted_current.txt b/ui/ui-core/api/restricted_current.txt
index 44591d2..d67f858 100644
--- a/ui/ui-core/api/restricted_current.txt
+++ b/ui/ui-core/api/restricted_current.txt
@@ -38,6 +38,8 @@
   }
 
   public enum AutofillType {
+    method public static androidx.ui.autofill.AutofillType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.autofill.AutofillType[] values();
     enum_constant public static final androidx.ui.autofill.AutofillType AddressAuxiliaryDetails;
     enum_constant public static final androidx.ui.autofill.AutofillType AddressCountry;
     enum_constant public static final androidx.ui.autofill.AutofillType AddressLocality;
@@ -84,7 +86,7 @@
   @androidx.compose.Immutable public final class AbsoluteAlignment implements androidx.ui.core.Alignment {
     method public androidx.ui.unit.IntOffset align(androidx.ui.unit.IntSize size, androidx.ui.core.LayoutDirection layoutDirection);
     method @androidx.compose.Immutable public androidx.ui.core.AbsoluteAlignment copy(float verticalBias, float horizontalBias);
-    field public static final androidx.ui.core.AbsoluteAlignment.Companion! Companion;
+    field public static final androidx.ui.core.AbsoluteAlignment.Companion Companion;
   }
 
   public static final class AbsoluteAlignment.Companion {
@@ -113,7 +115,7 @@
 
   @androidx.compose.Immutable public interface Alignment {
     method public androidx.ui.unit.IntOffset align(androidx.ui.unit.IntSize size, androidx.ui.core.LayoutDirection layoutDirection = LayoutDirection.Ltr);
-    field public static final androidx.ui.core.Alignment.Companion! Companion;
+    field public static final androidx.ui.core.Alignment.Companion Companion;
   }
 
   public static final class Alignment.Companion {
@@ -158,7 +160,7 @@
   }
 
   @androidx.compose.Immutable public abstract sealed class AlignmentLine {
-    field public static final androidx.ui.core.AlignmentLine.Companion! Companion;
+    field public static final androidx.ui.core.AlignmentLine.Companion Companion;
     field public static final int Unspecified = -2147483648; // 0x80000000
   }
 
@@ -254,7 +256,7 @@
 
   @androidx.compose.Stable public interface ContentScale {
     method public float scale(androidx.ui.geometry.Size srcSize, androidx.ui.geometry.Size dstSize);
-    field public static final androidx.ui.core.ContentScale.Companion! Companion;
+    field public static final androidx.ui.core.ContentScale.Companion Companion;
   }
 
   public static final class ContentScale.Companion {
@@ -303,6 +305,8 @@
   }
 
   public enum Direction {
+    method public static androidx.ui.core.Direction valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.Direction[] values();
     enum_constant public static final androidx.ui.core.Direction DOWN;
     enum_constant public static final androidx.ui.core.Direction LEFT;
     enum_constant public static final androidx.ui.core.Direction RIGHT;
@@ -355,6 +359,8 @@
   }
 
   public enum DropDownAlignment {
+    method public static androidx.ui.core.DropDownAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.DropDownAlignment[] values();
     enum_constant public static final androidx.ui.core.DropDownAlignment End;
     enum_constant public static final androidx.ui.core.DropDownAlignment Start;
   }
@@ -394,11 +400,15 @@
   }
 
   @kotlin.PublishedApi internal enum IntrinsicMinMax {
+    method public static androidx.ui.core.IntrinsicMinMax valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.IntrinsicMinMax[] values();
     enum_constant public static final androidx.ui.core.IntrinsicMinMax Max;
     enum_constant public static final androidx.ui.core.IntrinsicMinMax Min;
   }
 
   @kotlin.PublishedApi internal enum IntrinsicWidthHeight {
+    method public static androidx.ui.core.IntrinsicWidthHeight valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.IntrinsicWidthHeight[] values();
     enum_constant public static final androidx.ui.core.IntrinsicWidthHeight Height;
     enum_constant public static final androidx.ui.core.IntrinsicWidthHeight Width;
   }
@@ -540,6 +550,8 @@
   }
 
   public enum LayoutNode.LayoutState {
+    method public static androidx.ui.core.LayoutNode.LayoutState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.LayoutNode.LayoutState[] values();
     enum_constant public static final androidx.ui.core.LayoutNode.LayoutState LayingOut;
     enum_constant public static final androidx.ui.core.LayoutNode.LayoutState Measuring;
     enum_constant public static final androidx.ui.core.LayoutNode.LayoutState NeedsRelayout;
@@ -623,7 +635,7 @@
     method public <R> R! foldIn(R? initial, kotlin.jvm.functions.Function2<? super R,? super androidx.ui.core.Modifier.Element,? extends R> operation);
     method public <R> R! foldOut(R? initial, kotlin.jvm.functions.Function2<? super androidx.ui.core.Modifier.Element,? super R,? extends R> operation);
     method public default operator androidx.ui.core.Modifier plus(androidx.ui.core.Modifier other);
-    field public static final androidx.ui.core.Modifier.Companion! Companion;
+    field public static final androidx.ui.core.Modifier.Companion Companion;
   }
 
   public static final class Modifier.Companion implements androidx.ui.core.Modifier {
@@ -724,7 +736,7 @@
     property public abstract boolean showLayoutBounds;
     property public abstract androidx.ui.input.TextInputService textInputService;
     property public abstract androidx.ui.core.texttoolbar.TextToolbar textToolbar;
-    field public static final androidx.ui.core.Owner.Companion! Companion;
+    field public static final androidx.ui.core.Owner.Companion Companion;
   }
 
   public static final class Owner.Companion {
@@ -774,6 +786,8 @@
   }
 
   public enum PointerEventPass {
+    method public static androidx.ui.core.PointerEventPass valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.PointerEventPass[] values();
     enum_constant public static final androidx.ui.core.PointerEventPass InitialDown;
     enum_constant public static final androidx.ui.core.PointerEventPass PostDown;
     enum_constant public static final androidx.ui.core.PointerEventPass PostUp;
@@ -865,7 +879,7 @@
     method public static float getPivotFractionY-impl(long $this);
     method @androidx.compose.Immutable public static inline int hashCode-impl(long p);
     method @androidx.compose.Immutable public static inline String! toString-impl(long p);
-    field public static final androidx.ui.core.TransformOrigin.Companion! Companion;
+    field public static final androidx.ui.core.TransformOrigin.Companion Companion;
   }
 
   public static final class TransformOrigin.Companion {
@@ -928,6 +942,8 @@
 package androidx.ui.core.focus {
 
   public enum FocusDetailedState {
+    method public static androidx.ui.core.focus.FocusDetailedState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.focus.FocusDetailedState[] values();
     enum_constant public static final androidx.ui.core.focus.FocusDetailedState Active;
     enum_constant public static final androidx.ui.core.focus.FocusDetailedState ActiveParent;
     enum_constant public static final androidx.ui.core.focus.FocusDetailedState Captured;
@@ -952,6 +968,8 @@
   }
 
   public enum FocusState {
+    method public static androidx.ui.core.focus.FocusState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.focus.FocusState[] values();
     enum_constant public static final androidx.ui.core.focus.FocusState Focused;
     enum_constant public static final androidx.ui.core.focus.FocusState NotFocusable;
     enum_constant public static final androidx.ui.core.focus.FocusState NotFocused;
@@ -1084,13 +1102,15 @@
   }
 
   public enum DelayUpMessage {
+    method public static androidx.ui.core.gesture.customevents.DelayUpMessage valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.gesture.customevents.DelayUpMessage[] values();
     enum_constant public static final androidx.ui.core.gesture.customevents.DelayUpMessage DelayUp;
     enum_constant public static final androidx.ui.core.gesture.customevents.DelayUpMessage DelayedUpConsumed;
     enum_constant public static final androidx.ui.core.gesture.customevents.DelayUpMessage DelayedUpNotConsumed;
   }
 
   public final class LongPressFiredEvent implements androidx.ui.core.CustomEvent {
-    field public static final androidx.ui.core.gesture.customevents.LongPressFiredEvent! INSTANCE;
+    field public static final androidx.ui.core.gesture.customevents.LongPressFiredEvent INSTANCE;
   }
 
 }
@@ -1119,6 +1139,8 @@
   }
 
   public enum HapticFeedbackType {
+    method public static androidx.ui.core.hapticfeedback.HapticFeedbackType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.hapticfeedback.HapticFeedbackType[] values();
     enum_constant public static final androidx.ui.core.hapticfeedback.HapticFeedbackType LongPress;
     enum_constant public static final androidx.ui.core.hapticfeedback.HapticFeedbackType TextHandleMove;
   }
@@ -1152,7 +1174,7 @@
     method public int getKeyCode();
     method public static inline int hashCode-impl(int p);
     method public static String toString-impl(int $this);
-    field public static final androidx.ui.core.keyinput.Key.Companion! Companion;
+    field public static final androidx.ui.core.keyinput.Key.Companion Companion;
   }
 
   public static final class Key.Companion {
@@ -1745,6 +1767,8 @@
   }
 
   public enum KeyEventType {
+    method public static androidx.ui.core.keyinput.KeyEventType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.keyinput.KeyEventType[] values();
     enum_constant public static final androidx.ui.core.keyinput.KeyEventType KeyDown;
     enum_constant public static final androidx.ui.core.keyinput.KeyEventType KeyUp;
   }
@@ -1914,7 +1938,7 @@
     property public final boolean isRoot;
     property public final androidx.ui.core.semantics.SemanticsNode? parent;
     property public final androidx.ui.unit.IntSize size;
-    field public static final androidx.ui.core.semantics.SemanticsNode.Companion! Companion;
+    field public static final androidx.ui.core.semantics.SemanticsNode.Companion Companion;
   }
 
   public static final class SemanticsNode.Companion {
@@ -1948,6 +1972,8 @@
   }
 
   public enum TextToolbarStatus {
+    method public static androidx.ui.core.texttoolbar.TextToolbarStatus valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.texttoolbar.TextToolbarStatus[] values();
     enum_constant public static final androidx.ui.core.texttoolbar.TextToolbarStatus Hidden;
     enum_constant public static final androidx.ui.core.texttoolbar.TextToolbarStatus Shown;
   }
@@ -2262,7 +2288,7 @@
     property @Deprecated public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function0<java.lang.Boolean>>> ScrollForward;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function2<java.lang.Float,java.lang.Float,java.lang.Boolean>>> ScrollTo;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.semantics.AccessibilityAction<kotlin.jvm.functions.Function1<java.lang.Float,java.lang.Boolean>>> SetProgress;
-    field public static final androidx.ui.semantics.SemanticsActions! INSTANCE;
+    field public static final androidx.ui.semantics.SemanticsActions INSTANCE;
   }
 
   public final class SemanticsProperties {
@@ -2282,7 +2308,7 @@
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> IsPopup;
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.String> TestTag;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.text.AnnotatedString> Text;
-    field public static final androidx.ui.semantics.SemanticsProperties! INSTANCE;
+    field public static final androidx.ui.semantics.SemanticsProperties INSTANCE;
   }
 
   public final class SemanticsPropertiesKt {
diff --git a/ui/ui-foundation/api/0.1.0-dev15.txt b/ui/ui-foundation/api/0.1.0-dev15.txt
index b060774..b324b25 100644
--- a/ui/ui-foundation/api/0.1.0-dev15.txt
+++ b/ui/ui-foundation/api/0.1.0-dev15.txt
@@ -99,11 +99,11 @@
   }
 
   public static final class Interaction.Dragged implements androidx.ui.foundation.Interaction {
-    field public static final androidx.ui.foundation.Interaction.Dragged! INSTANCE;
+    field public static final androidx.ui.foundation.Interaction.Dragged INSTANCE;
   }
 
   public static final class Interaction.Pressed implements androidx.ui.foundation.Interaction {
-    field public static final androidx.ui.foundation.Interaction.Pressed! INSTANCE;
+    field public static final androidx.ui.foundation.Interaction.Pressed INSTANCE;
   }
 
   @androidx.compose.Stable public final class InteractionState implements androidx.compose.State<java.util.Set<? extends androidx.ui.foundation.Interaction>> {
@@ -134,7 +134,7 @@
     property public final boolean isAnimating;
     property public final float maxPosition;
     property public final float value;
-    field public static final androidx.ui.foundation.ScrollerPosition.Companion! Companion;
+    field public static final androidx.ui.foundation.ScrollerPosition.Companion Companion;
   }
 
   public static final class ScrollerPosition.Companion {
@@ -156,7 +156,7 @@
     property public final String Selected;
     property public final String TemplatePercent;
     property public final String Unchecked;
-    field public static final androidx.ui.foundation.Strings! INSTANCE;
+    field public static final androidx.ui.foundation.Strings INSTANCE;
   }
 
   public final class TemporaryKt {
@@ -176,7 +176,7 @@
     method @Deprecated @androidx.compose.Immutable public androidx.ui.foundation.TextFieldValue copy(String text, androidx.ui.text.TextRange selection);
     method @Deprecated public androidx.ui.text.TextRange getSelection();
     method @Deprecated public String getText();
-    field @Deprecated public static final androidx.ui.foundation.TextFieldValue.Companion! Companion;
+    field @Deprecated public static final androidx.ui.foundation.TextFieldValue.Companion Companion;
   }
 
   @Deprecated public static final class TextFieldValue.Companion {
@@ -234,7 +234,7 @@
   public final class AndroidFlingSpline {
     method public double deceleration(float velocity, float friction);
     method public androidx.ui.foundation.animation.AndroidFlingSpline.FlingResult flingPosition(float time);
-    field public static final androidx.ui.foundation.animation.AndroidFlingSpline! INSTANCE;
+    field public static final androidx.ui.foundation.animation.AndroidFlingSpline INSTANCE;
   }
 
   public static final class AndroidFlingSpline.FlingResult {
@@ -274,11 +274,11 @@
   }
 
   public static final class DragDirection.Horizontal extends androidx.ui.foundation.gestures.DragDirection {
-    field public static final androidx.ui.foundation.gestures.DragDirection.Horizontal! INSTANCE;
+    field public static final androidx.ui.foundation.gestures.DragDirection.Horizontal INSTANCE;
   }
 
   public static final class DragDirection.Vertical extends androidx.ui.foundation.gestures.DragDirection {
-    field public static final androidx.ui.foundation.gestures.DragDirection.Vertical! INSTANCE;
+    field public static final androidx.ui.foundation.gestures.DragDirection.Vertical INSTANCE;
   }
 
   public final class DraggableKt {
@@ -342,6 +342,8 @@
   }
 
   public enum ToggleableState {
+    method public static androidx.ui.foundation.selection.ToggleableState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.foundation.selection.ToggleableState[] values();
     enum_constant public static final androidx.ui.foundation.selection.ToggleableState Indeterminate;
     enum_constant public static final androidx.ui.foundation.selection.ToggleableState Off;
     enum_constant public static final androidx.ui.foundation.selection.ToggleableState On;
@@ -360,7 +362,7 @@
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> IsDialog;
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Selected;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.foundation.selection.ToggleableState> ToggleableState;
-    field public static final androidx.ui.foundation.semantics.FoundationSemanticsProperties! INSTANCE;
+    field public static final androidx.ui.foundation.semantics.FoundationSemanticsProperties INSTANCE;
   }
 
   public final class FoundationSemanticsPropertiesKt {
diff --git a/ui/ui-foundation/api/current.txt b/ui/ui-foundation/api/current.txt
index b060774..b324b25 100644
--- a/ui/ui-foundation/api/current.txt
+++ b/ui/ui-foundation/api/current.txt
@@ -99,11 +99,11 @@
   }
 
   public static final class Interaction.Dragged implements androidx.ui.foundation.Interaction {
-    field public static final androidx.ui.foundation.Interaction.Dragged! INSTANCE;
+    field public static final androidx.ui.foundation.Interaction.Dragged INSTANCE;
   }
 
   public static final class Interaction.Pressed implements androidx.ui.foundation.Interaction {
-    field public static final androidx.ui.foundation.Interaction.Pressed! INSTANCE;
+    field public static final androidx.ui.foundation.Interaction.Pressed INSTANCE;
   }
 
   @androidx.compose.Stable public final class InteractionState implements androidx.compose.State<java.util.Set<? extends androidx.ui.foundation.Interaction>> {
@@ -134,7 +134,7 @@
     property public final boolean isAnimating;
     property public final float maxPosition;
     property public final float value;
-    field public static final androidx.ui.foundation.ScrollerPosition.Companion! Companion;
+    field public static final androidx.ui.foundation.ScrollerPosition.Companion Companion;
   }
 
   public static final class ScrollerPosition.Companion {
@@ -156,7 +156,7 @@
     property public final String Selected;
     property public final String TemplatePercent;
     property public final String Unchecked;
-    field public static final androidx.ui.foundation.Strings! INSTANCE;
+    field public static final androidx.ui.foundation.Strings INSTANCE;
   }
 
   public final class TemporaryKt {
@@ -176,7 +176,7 @@
     method @Deprecated @androidx.compose.Immutable public androidx.ui.foundation.TextFieldValue copy(String text, androidx.ui.text.TextRange selection);
     method @Deprecated public androidx.ui.text.TextRange getSelection();
     method @Deprecated public String getText();
-    field @Deprecated public static final androidx.ui.foundation.TextFieldValue.Companion! Companion;
+    field @Deprecated public static final androidx.ui.foundation.TextFieldValue.Companion Companion;
   }
 
   @Deprecated public static final class TextFieldValue.Companion {
@@ -234,7 +234,7 @@
   public final class AndroidFlingSpline {
     method public double deceleration(float velocity, float friction);
     method public androidx.ui.foundation.animation.AndroidFlingSpline.FlingResult flingPosition(float time);
-    field public static final androidx.ui.foundation.animation.AndroidFlingSpline! INSTANCE;
+    field public static final androidx.ui.foundation.animation.AndroidFlingSpline INSTANCE;
   }
 
   public static final class AndroidFlingSpline.FlingResult {
@@ -274,11 +274,11 @@
   }
 
   public static final class DragDirection.Horizontal extends androidx.ui.foundation.gestures.DragDirection {
-    field public static final androidx.ui.foundation.gestures.DragDirection.Horizontal! INSTANCE;
+    field public static final androidx.ui.foundation.gestures.DragDirection.Horizontal INSTANCE;
   }
 
   public static final class DragDirection.Vertical extends androidx.ui.foundation.gestures.DragDirection {
-    field public static final androidx.ui.foundation.gestures.DragDirection.Vertical! INSTANCE;
+    field public static final androidx.ui.foundation.gestures.DragDirection.Vertical INSTANCE;
   }
 
   public final class DraggableKt {
@@ -342,6 +342,8 @@
   }
 
   public enum ToggleableState {
+    method public static androidx.ui.foundation.selection.ToggleableState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.foundation.selection.ToggleableState[] values();
     enum_constant public static final androidx.ui.foundation.selection.ToggleableState Indeterminate;
     enum_constant public static final androidx.ui.foundation.selection.ToggleableState Off;
     enum_constant public static final androidx.ui.foundation.selection.ToggleableState On;
@@ -360,7 +362,7 @@
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> IsDialog;
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Selected;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.foundation.selection.ToggleableState> ToggleableState;
-    field public static final androidx.ui.foundation.semantics.FoundationSemanticsProperties! INSTANCE;
+    field public static final androidx.ui.foundation.semantics.FoundationSemanticsProperties INSTANCE;
   }
 
   public final class FoundationSemanticsPropertiesKt {
diff --git a/ui/ui-foundation/api/public_plus_experimental_0.1.0-dev15.txt b/ui/ui-foundation/api/public_plus_experimental_0.1.0-dev15.txt
index b060774..b324b25 100644
--- a/ui/ui-foundation/api/public_plus_experimental_0.1.0-dev15.txt
+++ b/ui/ui-foundation/api/public_plus_experimental_0.1.0-dev15.txt
@@ -99,11 +99,11 @@
   }
 
   public static final class Interaction.Dragged implements androidx.ui.foundation.Interaction {
-    field public static final androidx.ui.foundation.Interaction.Dragged! INSTANCE;
+    field public static final androidx.ui.foundation.Interaction.Dragged INSTANCE;
   }
 
   public static final class Interaction.Pressed implements androidx.ui.foundation.Interaction {
-    field public static final androidx.ui.foundation.Interaction.Pressed! INSTANCE;
+    field public static final androidx.ui.foundation.Interaction.Pressed INSTANCE;
   }
 
   @androidx.compose.Stable public final class InteractionState implements androidx.compose.State<java.util.Set<? extends androidx.ui.foundation.Interaction>> {
@@ -134,7 +134,7 @@
     property public final boolean isAnimating;
     property public final float maxPosition;
     property public final float value;
-    field public static final androidx.ui.foundation.ScrollerPosition.Companion! Companion;
+    field public static final androidx.ui.foundation.ScrollerPosition.Companion Companion;
   }
 
   public static final class ScrollerPosition.Companion {
@@ -156,7 +156,7 @@
     property public final String Selected;
     property public final String TemplatePercent;
     property public final String Unchecked;
-    field public static final androidx.ui.foundation.Strings! INSTANCE;
+    field public static final androidx.ui.foundation.Strings INSTANCE;
   }
 
   public final class TemporaryKt {
@@ -176,7 +176,7 @@
     method @Deprecated @androidx.compose.Immutable public androidx.ui.foundation.TextFieldValue copy(String text, androidx.ui.text.TextRange selection);
     method @Deprecated public androidx.ui.text.TextRange getSelection();
     method @Deprecated public String getText();
-    field @Deprecated public static final androidx.ui.foundation.TextFieldValue.Companion! Companion;
+    field @Deprecated public static final androidx.ui.foundation.TextFieldValue.Companion Companion;
   }
 
   @Deprecated public static final class TextFieldValue.Companion {
@@ -234,7 +234,7 @@
   public final class AndroidFlingSpline {
     method public double deceleration(float velocity, float friction);
     method public androidx.ui.foundation.animation.AndroidFlingSpline.FlingResult flingPosition(float time);
-    field public static final androidx.ui.foundation.animation.AndroidFlingSpline! INSTANCE;
+    field public static final androidx.ui.foundation.animation.AndroidFlingSpline INSTANCE;
   }
 
   public static final class AndroidFlingSpline.FlingResult {
@@ -274,11 +274,11 @@
   }
 
   public static final class DragDirection.Horizontal extends androidx.ui.foundation.gestures.DragDirection {
-    field public static final androidx.ui.foundation.gestures.DragDirection.Horizontal! INSTANCE;
+    field public static final androidx.ui.foundation.gestures.DragDirection.Horizontal INSTANCE;
   }
 
   public static final class DragDirection.Vertical extends androidx.ui.foundation.gestures.DragDirection {
-    field public static final androidx.ui.foundation.gestures.DragDirection.Vertical! INSTANCE;
+    field public static final androidx.ui.foundation.gestures.DragDirection.Vertical INSTANCE;
   }
 
   public final class DraggableKt {
@@ -342,6 +342,8 @@
   }
 
   public enum ToggleableState {
+    method public static androidx.ui.foundation.selection.ToggleableState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.foundation.selection.ToggleableState[] values();
     enum_constant public static final androidx.ui.foundation.selection.ToggleableState Indeterminate;
     enum_constant public static final androidx.ui.foundation.selection.ToggleableState Off;
     enum_constant public static final androidx.ui.foundation.selection.ToggleableState On;
@@ -360,7 +362,7 @@
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> IsDialog;
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Selected;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.foundation.selection.ToggleableState> ToggleableState;
-    field public static final androidx.ui.foundation.semantics.FoundationSemanticsProperties! INSTANCE;
+    field public static final androidx.ui.foundation.semantics.FoundationSemanticsProperties INSTANCE;
   }
 
   public final class FoundationSemanticsPropertiesKt {
diff --git a/ui/ui-foundation/api/public_plus_experimental_current.txt b/ui/ui-foundation/api/public_plus_experimental_current.txt
index b060774..b324b25 100644
--- a/ui/ui-foundation/api/public_plus_experimental_current.txt
+++ b/ui/ui-foundation/api/public_plus_experimental_current.txt
@@ -99,11 +99,11 @@
   }
 
   public static final class Interaction.Dragged implements androidx.ui.foundation.Interaction {
-    field public static final androidx.ui.foundation.Interaction.Dragged! INSTANCE;
+    field public static final androidx.ui.foundation.Interaction.Dragged INSTANCE;
   }
 
   public static final class Interaction.Pressed implements androidx.ui.foundation.Interaction {
-    field public static final androidx.ui.foundation.Interaction.Pressed! INSTANCE;
+    field public static final androidx.ui.foundation.Interaction.Pressed INSTANCE;
   }
 
   @androidx.compose.Stable public final class InteractionState implements androidx.compose.State<java.util.Set<? extends androidx.ui.foundation.Interaction>> {
@@ -134,7 +134,7 @@
     property public final boolean isAnimating;
     property public final float maxPosition;
     property public final float value;
-    field public static final androidx.ui.foundation.ScrollerPosition.Companion! Companion;
+    field public static final androidx.ui.foundation.ScrollerPosition.Companion Companion;
   }
 
   public static final class ScrollerPosition.Companion {
@@ -156,7 +156,7 @@
     property public final String Selected;
     property public final String TemplatePercent;
     property public final String Unchecked;
-    field public static final androidx.ui.foundation.Strings! INSTANCE;
+    field public static final androidx.ui.foundation.Strings INSTANCE;
   }
 
   public final class TemporaryKt {
@@ -176,7 +176,7 @@
     method @Deprecated @androidx.compose.Immutable public androidx.ui.foundation.TextFieldValue copy(String text, androidx.ui.text.TextRange selection);
     method @Deprecated public androidx.ui.text.TextRange getSelection();
     method @Deprecated public String getText();
-    field @Deprecated public static final androidx.ui.foundation.TextFieldValue.Companion! Companion;
+    field @Deprecated public static final androidx.ui.foundation.TextFieldValue.Companion Companion;
   }
 
   @Deprecated public static final class TextFieldValue.Companion {
@@ -234,7 +234,7 @@
   public final class AndroidFlingSpline {
     method public double deceleration(float velocity, float friction);
     method public androidx.ui.foundation.animation.AndroidFlingSpline.FlingResult flingPosition(float time);
-    field public static final androidx.ui.foundation.animation.AndroidFlingSpline! INSTANCE;
+    field public static final androidx.ui.foundation.animation.AndroidFlingSpline INSTANCE;
   }
 
   public static final class AndroidFlingSpline.FlingResult {
@@ -274,11 +274,11 @@
   }
 
   public static final class DragDirection.Horizontal extends androidx.ui.foundation.gestures.DragDirection {
-    field public static final androidx.ui.foundation.gestures.DragDirection.Horizontal! INSTANCE;
+    field public static final androidx.ui.foundation.gestures.DragDirection.Horizontal INSTANCE;
   }
 
   public static final class DragDirection.Vertical extends androidx.ui.foundation.gestures.DragDirection {
-    field public static final androidx.ui.foundation.gestures.DragDirection.Vertical! INSTANCE;
+    field public static final androidx.ui.foundation.gestures.DragDirection.Vertical INSTANCE;
   }
 
   public final class DraggableKt {
@@ -342,6 +342,8 @@
   }
 
   public enum ToggleableState {
+    method public static androidx.ui.foundation.selection.ToggleableState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.foundation.selection.ToggleableState[] values();
     enum_constant public static final androidx.ui.foundation.selection.ToggleableState Indeterminate;
     enum_constant public static final androidx.ui.foundation.selection.ToggleableState Off;
     enum_constant public static final androidx.ui.foundation.selection.ToggleableState On;
@@ -360,7 +362,7 @@
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> IsDialog;
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Selected;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.foundation.selection.ToggleableState> ToggleableState;
-    field public static final androidx.ui.foundation.semantics.FoundationSemanticsProperties! INSTANCE;
+    field public static final androidx.ui.foundation.semantics.FoundationSemanticsProperties INSTANCE;
   }
 
   public final class FoundationSemanticsPropertiesKt {
diff --git a/ui/ui-foundation/api/restricted_0.1.0-dev15.txt b/ui/ui-foundation/api/restricted_0.1.0-dev15.txt
index b060774..b324b25 100644
--- a/ui/ui-foundation/api/restricted_0.1.0-dev15.txt
+++ b/ui/ui-foundation/api/restricted_0.1.0-dev15.txt
@@ -99,11 +99,11 @@
   }
 
   public static final class Interaction.Dragged implements androidx.ui.foundation.Interaction {
-    field public static final androidx.ui.foundation.Interaction.Dragged! INSTANCE;
+    field public static final androidx.ui.foundation.Interaction.Dragged INSTANCE;
   }
 
   public static final class Interaction.Pressed implements androidx.ui.foundation.Interaction {
-    field public static final androidx.ui.foundation.Interaction.Pressed! INSTANCE;
+    field public static final androidx.ui.foundation.Interaction.Pressed INSTANCE;
   }
 
   @androidx.compose.Stable public final class InteractionState implements androidx.compose.State<java.util.Set<? extends androidx.ui.foundation.Interaction>> {
@@ -134,7 +134,7 @@
     property public final boolean isAnimating;
     property public final float maxPosition;
     property public final float value;
-    field public static final androidx.ui.foundation.ScrollerPosition.Companion! Companion;
+    field public static final androidx.ui.foundation.ScrollerPosition.Companion Companion;
   }
 
   public static final class ScrollerPosition.Companion {
@@ -156,7 +156,7 @@
     property public final String Selected;
     property public final String TemplatePercent;
     property public final String Unchecked;
-    field public static final androidx.ui.foundation.Strings! INSTANCE;
+    field public static final androidx.ui.foundation.Strings INSTANCE;
   }
 
   public final class TemporaryKt {
@@ -176,7 +176,7 @@
     method @Deprecated @androidx.compose.Immutable public androidx.ui.foundation.TextFieldValue copy(String text, androidx.ui.text.TextRange selection);
     method @Deprecated public androidx.ui.text.TextRange getSelection();
     method @Deprecated public String getText();
-    field @Deprecated public static final androidx.ui.foundation.TextFieldValue.Companion! Companion;
+    field @Deprecated public static final androidx.ui.foundation.TextFieldValue.Companion Companion;
   }
 
   @Deprecated public static final class TextFieldValue.Companion {
@@ -234,7 +234,7 @@
   public final class AndroidFlingSpline {
     method public double deceleration(float velocity, float friction);
     method public androidx.ui.foundation.animation.AndroidFlingSpline.FlingResult flingPosition(float time);
-    field public static final androidx.ui.foundation.animation.AndroidFlingSpline! INSTANCE;
+    field public static final androidx.ui.foundation.animation.AndroidFlingSpline INSTANCE;
   }
 
   public static final class AndroidFlingSpline.FlingResult {
@@ -274,11 +274,11 @@
   }
 
   public static final class DragDirection.Horizontal extends androidx.ui.foundation.gestures.DragDirection {
-    field public static final androidx.ui.foundation.gestures.DragDirection.Horizontal! INSTANCE;
+    field public static final androidx.ui.foundation.gestures.DragDirection.Horizontal INSTANCE;
   }
 
   public static final class DragDirection.Vertical extends androidx.ui.foundation.gestures.DragDirection {
-    field public static final androidx.ui.foundation.gestures.DragDirection.Vertical! INSTANCE;
+    field public static final androidx.ui.foundation.gestures.DragDirection.Vertical INSTANCE;
   }
 
   public final class DraggableKt {
@@ -342,6 +342,8 @@
   }
 
   public enum ToggleableState {
+    method public static androidx.ui.foundation.selection.ToggleableState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.foundation.selection.ToggleableState[] values();
     enum_constant public static final androidx.ui.foundation.selection.ToggleableState Indeterminate;
     enum_constant public static final androidx.ui.foundation.selection.ToggleableState Off;
     enum_constant public static final androidx.ui.foundation.selection.ToggleableState On;
@@ -360,7 +362,7 @@
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> IsDialog;
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Selected;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.foundation.selection.ToggleableState> ToggleableState;
-    field public static final androidx.ui.foundation.semantics.FoundationSemanticsProperties! INSTANCE;
+    field public static final androidx.ui.foundation.semantics.FoundationSemanticsProperties INSTANCE;
   }
 
   public final class FoundationSemanticsPropertiesKt {
diff --git a/ui/ui-foundation/api/restricted_current.txt b/ui/ui-foundation/api/restricted_current.txt
index b060774..b324b25 100644
--- a/ui/ui-foundation/api/restricted_current.txt
+++ b/ui/ui-foundation/api/restricted_current.txt
@@ -99,11 +99,11 @@
   }
 
   public static final class Interaction.Dragged implements androidx.ui.foundation.Interaction {
-    field public static final androidx.ui.foundation.Interaction.Dragged! INSTANCE;
+    field public static final androidx.ui.foundation.Interaction.Dragged INSTANCE;
   }
 
   public static final class Interaction.Pressed implements androidx.ui.foundation.Interaction {
-    field public static final androidx.ui.foundation.Interaction.Pressed! INSTANCE;
+    field public static final androidx.ui.foundation.Interaction.Pressed INSTANCE;
   }
 
   @androidx.compose.Stable public final class InteractionState implements androidx.compose.State<java.util.Set<? extends androidx.ui.foundation.Interaction>> {
@@ -134,7 +134,7 @@
     property public final boolean isAnimating;
     property public final float maxPosition;
     property public final float value;
-    field public static final androidx.ui.foundation.ScrollerPosition.Companion! Companion;
+    field public static final androidx.ui.foundation.ScrollerPosition.Companion Companion;
   }
 
   public static final class ScrollerPosition.Companion {
@@ -156,7 +156,7 @@
     property public final String Selected;
     property public final String TemplatePercent;
     property public final String Unchecked;
-    field public static final androidx.ui.foundation.Strings! INSTANCE;
+    field public static final androidx.ui.foundation.Strings INSTANCE;
   }
 
   public final class TemporaryKt {
@@ -176,7 +176,7 @@
     method @Deprecated @androidx.compose.Immutable public androidx.ui.foundation.TextFieldValue copy(String text, androidx.ui.text.TextRange selection);
     method @Deprecated public androidx.ui.text.TextRange getSelection();
     method @Deprecated public String getText();
-    field @Deprecated public static final androidx.ui.foundation.TextFieldValue.Companion! Companion;
+    field @Deprecated public static final androidx.ui.foundation.TextFieldValue.Companion Companion;
   }
 
   @Deprecated public static final class TextFieldValue.Companion {
@@ -234,7 +234,7 @@
   public final class AndroidFlingSpline {
     method public double deceleration(float velocity, float friction);
     method public androidx.ui.foundation.animation.AndroidFlingSpline.FlingResult flingPosition(float time);
-    field public static final androidx.ui.foundation.animation.AndroidFlingSpline! INSTANCE;
+    field public static final androidx.ui.foundation.animation.AndroidFlingSpline INSTANCE;
   }
 
   public static final class AndroidFlingSpline.FlingResult {
@@ -274,11 +274,11 @@
   }
 
   public static final class DragDirection.Horizontal extends androidx.ui.foundation.gestures.DragDirection {
-    field public static final androidx.ui.foundation.gestures.DragDirection.Horizontal! INSTANCE;
+    field public static final androidx.ui.foundation.gestures.DragDirection.Horizontal INSTANCE;
   }
 
   public static final class DragDirection.Vertical extends androidx.ui.foundation.gestures.DragDirection {
-    field public static final androidx.ui.foundation.gestures.DragDirection.Vertical! INSTANCE;
+    field public static final androidx.ui.foundation.gestures.DragDirection.Vertical INSTANCE;
   }
 
   public final class DraggableKt {
@@ -342,6 +342,8 @@
   }
 
   public enum ToggleableState {
+    method public static androidx.ui.foundation.selection.ToggleableState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.foundation.selection.ToggleableState[] values();
     enum_constant public static final androidx.ui.foundation.selection.ToggleableState Indeterminate;
     enum_constant public static final androidx.ui.foundation.selection.ToggleableState Off;
     enum_constant public static final androidx.ui.foundation.selection.ToggleableState On;
@@ -360,7 +362,7 @@
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> IsDialog;
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> Selected;
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.foundation.selection.ToggleableState> ToggleableState;
-    field public static final androidx.ui.foundation.semantics.FoundationSemanticsProperties! INSTANCE;
+    field public static final androidx.ui.foundation.semantics.FoundationSemanticsProperties INSTANCE;
   }
 
   public final class FoundationSemanticsPropertiesKt {
diff --git a/ui/ui-geometry/api/0.1.0-dev15.txt b/ui/ui-geometry/api/0.1.0-dev15.txt
index 6420059..f20e212 100644
--- a/ui/ui-geometry/api/0.1.0-dev15.txt
+++ b/ui/ui-geometry/api/0.1.0-dev15.txt
@@ -17,7 +17,7 @@
     method @androidx.compose.Stable public operator androidx.ui.geometry.Offset unaryMinus();
     property public final float x;
     property public final float y;
-    field public static final androidx.ui.geometry.Offset.Companion! Companion;
+    field public static final androidx.ui.geometry.Offset.Companion Companion;
   }
 
   public static final class Offset.Companion {
@@ -78,7 +78,7 @@
     method public static androidx.ui.geometry.RRect getZero();
     property public final float height;
     property public final float width;
-    field public static final androidx.ui.geometry.RRect.Companion! Companion;
+    field public static final androidx.ui.geometry.RRect.Companion Companion;
   }
 
   public static final class RRect.Companion {
@@ -135,7 +135,7 @@
     method public static String toString-impl(long $this);
     method public static long truncDiv-impl(long $this, float operand);
     method @androidx.compose.Stable public static operator long unaryMinus-impl(long $this);
-    field public static final androidx.ui.geometry.Radius.Companion! Companion;
+    field public static final androidx.ui.geometry.Radius.Companion Companion;
   }
 
   public static final class Radius.Companion {
@@ -189,7 +189,7 @@
     property public final float maxDimension;
     property public final float minDimension;
     property public final float width;
-    field public static final androidx.ui.geometry.Rect.Companion! Companion;
+    field public static final androidx.ui.geometry.Rect.Companion Companion;
   }
 
   public static final class Rect.Companion {
@@ -239,7 +239,7 @@
     property public final float maxDimension;
     property public final float minDimension;
     property public final float width;
-    field public static final androidx.ui.geometry.Size.Companion! Companion;
+    field public static final androidx.ui.geometry.Size.Companion Companion;
   }
 
   public static final class Size.Companion {
diff --git a/ui/ui-geometry/api/api_lint.ignore b/ui/ui-geometry/api/api_lint.ignore
index c3e3a08..db1ca8b 100644
--- a/ui/ui-geometry/api/api_lint.ignore
+++ b/ui/ui-geometry/api/api_lint.ignore
@@ -3,3 +3,11 @@
     Acronyms should not be capitalized in method names: was `fromLTRB`, should this be `fromLtrb`?
 AcronymName: androidx.ui.geometry.Rect.Companion#fromLTWH(float, float, float, float):
     Acronyms should not be capitalized in method names: was `fromLTWH`, should this be `fromLtwh`?
+
+
+KotlinOperator: androidx.ui.geometry.RRect#contains(androidx.ui.geometry.Offset):
+    Note that adding the `operator` keyword would allow calling this method using operator syntax
+KotlinOperator: androidx.ui.geometry.Rect#contains(androidx.ui.geometry.Offset):
+    Note that adding the `operator` keyword would allow calling this method using operator syntax
+KotlinOperator: androidx.ui.geometry.Size#contains(androidx.ui.geometry.Offset):
+    Note that adding the `operator` keyword would allow calling this method using operator syntax
diff --git a/ui/ui-geometry/api/current.txt b/ui/ui-geometry/api/current.txt
index 6420059..f20e212 100644
--- a/ui/ui-geometry/api/current.txt
+++ b/ui/ui-geometry/api/current.txt
@@ -17,7 +17,7 @@
     method @androidx.compose.Stable public operator androidx.ui.geometry.Offset unaryMinus();
     property public final float x;
     property public final float y;
-    field public static final androidx.ui.geometry.Offset.Companion! Companion;
+    field public static final androidx.ui.geometry.Offset.Companion Companion;
   }
 
   public static final class Offset.Companion {
@@ -78,7 +78,7 @@
     method public static androidx.ui.geometry.RRect getZero();
     property public final float height;
     property public final float width;
-    field public static final androidx.ui.geometry.RRect.Companion! Companion;
+    field public static final androidx.ui.geometry.RRect.Companion Companion;
   }
 
   public static final class RRect.Companion {
@@ -135,7 +135,7 @@
     method public static String toString-impl(long $this);
     method public static long truncDiv-impl(long $this, float operand);
     method @androidx.compose.Stable public static operator long unaryMinus-impl(long $this);
-    field public static final androidx.ui.geometry.Radius.Companion! Companion;
+    field public static final androidx.ui.geometry.Radius.Companion Companion;
   }
 
   public static final class Radius.Companion {
@@ -189,7 +189,7 @@
     property public final float maxDimension;
     property public final float minDimension;
     property public final float width;
-    field public static final androidx.ui.geometry.Rect.Companion! Companion;
+    field public static final androidx.ui.geometry.Rect.Companion Companion;
   }
 
   public static final class Rect.Companion {
@@ -239,7 +239,7 @@
     property public final float maxDimension;
     property public final float minDimension;
     property public final float width;
-    field public static final androidx.ui.geometry.Size.Companion! Companion;
+    field public static final androidx.ui.geometry.Size.Companion Companion;
   }
 
   public static final class Size.Companion {
diff --git a/ui/ui-geometry/api/public_plus_experimental_0.1.0-dev15.txt b/ui/ui-geometry/api/public_plus_experimental_0.1.0-dev15.txt
index 6420059..f20e212 100644
--- a/ui/ui-geometry/api/public_plus_experimental_0.1.0-dev15.txt
+++ b/ui/ui-geometry/api/public_plus_experimental_0.1.0-dev15.txt
@@ -17,7 +17,7 @@
     method @androidx.compose.Stable public operator androidx.ui.geometry.Offset unaryMinus();
     property public final float x;
     property public final float y;
-    field public static final androidx.ui.geometry.Offset.Companion! Companion;
+    field public static final androidx.ui.geometry.Offset.Companion Companion;
   }
 
   public static final class Offset.Companion {
@@ -78,7 +78,7 @@
     method public static androidx.ui.geometry.RRect getZero();
     property public final float height;
     property public final float width;
-    field public static final androidx.ui.geometry.RRect.Companion! Companion;
+    field public static final androidx.ui.geometry.RRect.Companion Companion;
   }
 
   public static final class RRect.Companion {
@@ -135,7 +135,7 @@
     method public static String toString-impl(long $this);
     method public static long truncDiv-impl(long $this, float operand);
     method @androidx.compose.Stable public static operator long unaryMinus-impl(long $this);
-    field public static final androidx.ui.geometry.Radius.Companion! Companion;
+    field public static final androidx.ui.geometry.Radius.Companion Companion;
   }
 
   public static final class Radius.Companion {
@@ -189,7 +189,7 @@
     property public final float maxDimension;
     property public final float minDimension;
     property public final float width;
-    field public static final androidx.ui.geometry.Rect.Companion! Companion;
+    field public static final androidx.ui.geometry.Rect.Companion Companion;
   }
 
   public static final class Rect.Companion {
@@ -239,7 +239,7 @@
     property public final float maxDimension;
     property public final float minDimension;
     property public final float width;
-    field public static final androidx.ui.geometry.Size.Companion! Companion;
+    field public static final androidx.ui.geometry.Size.Companion Companion;
   }
 
   public static final class Size.Companion {
diff --git a/ui/ui-geometry/api/public_plus_experimental_current.txt b/ui/ui-geometry/api/public_plus_experimental_current.txt
index 6420059..f20e212 100644
--- a/ui/ui-geometry/api/public_plus_experimental_current.txt
+++ b/ui/ui-geometry/api/public_plus_experimental_current.txt
@@ -17,7 +17,7 @@
     method @androidx.compose.Stable public operator androidx.ui.geometry.Offset unaryMinus();
     property public final float x;
     property public final float y;
-    field public static final androidx.ui.geometry.Offset.Companion! Companion;
+    field public static final androidx.ui.geometry.Offset.Companion Companion;
   }
 
   public static final class Offset.Companion {
@@ -78,7 +78,7 @@
     method public static androidx.ui.geometry.RRect getZero();
     property public final float height;
     property public final float width;
-    field public static final androidx.ui.geometry.RRect.Companion! Companion;
+    field public static final androidx.ui.geometry.RRect.Companion Companion;
   }
 
   public static final class RRect.Companion {
@@ -135,7 +135,7 @@
     method public static String toString-impl(long $this);
     method public static long truncDiv-impl(long $this, float operand);
     method @androidx.compose.Stable public static operator long unaryMinus-impl(long $this);
-    field public static final androidx.ui.geometry.Radius.Companion! Companion;
+    field public static final androidx.ui.geometry.Radius.Companion Companion;
   }
 
   public static final class Radius.Companion {
@@ -189,7 +189,7 @@
     property public final float maxDimension;
     property public final float minDimension;
     property public final float width;
-    field public static final androidx.ui.geometry.Rect.Companion! Companion;
+    field public static final androidx.ui.geometry.Rect.Companion Companion;
   }
 
   public static final class Rect.Companion {
@@ -239,7 +239,7 @@
     property public final float maxDimension;
     property public final float minDimension;
     property public final float width;
-    field public static final androidx.ui.geometry.Size.Companion! Companion;
+    field public static final androidx.ui.geometry.Size.Companion Companion;
   }
 
   public static final class Size.Companion {
diff --git a/ui/ui-geometry/api/restricted_0.1.0-dev15.txt b/ui/ui-geometry/api/restricted_0.1.0-dev15.txt
index 6420059..f20e212 100644
--- a/ui/ui-geometry/api/restricted_0.1.0-dev15.txt
+++ b/ui/ui-geometry/api/restricted_0.1.0-dev15.txt
@@ -17,7 +17,7 @@
     method @androidx.compose.Stable public operator androidx.ui.geometry.Offset unaryMinus();
     property public final float x;
     property public final float y;
-    field public static final androidx.ui.geometry.Offset.Companion! Companion;
+    field public static final androidx.ui.geometry.Offset.Companion Companion;
   }
 
   public static final class Offset.Companion {
@@ -78,7 +78,7 @@
     method public static androidx.ui.geometry.RRect getZero();
     property public final float height;
     property public final float width;
-    field public static final androidx.ui.geometry.RRect.Companion! Companion;
+    field public static final androidx.ui.geometry.RRect.Companion Companion;
   }
 
   public static final class RRect.Companion {
@@ -135,7 +135,7 @@
     method public static String toString-impl(long $this);
     method public static long truncDiv-impl(long $this, float operand);
     method @androidx.compose.Stable public static operator long unaryMinus-impl(long $this);
-    field public static final androidx.ui.geometry.Radius.Companion! Companion;
+    field public static final androidx.ui.geometry.Radius.Companion Companion;
   }
 
   public static final class Radius.Companion {
@@ -189,7 +189,7 @@
     property public final float maxDimension;
     property public final float minDimension;
     property public final float width;
-    field public static final androidx.ui.geometry.Rect.Companion! Companion;
+    field public static final androidx.ui.geometry.Rect.Companion Companion;
   }
 
   public static final class Rect.Companion {
@@ -239,7 +239,7 @@
     property public final float maxDimension;
     property public final float minDimension;
     property public final float width;
-    field public static final androidx.ui.geometry.Size.Companion! Companion;
+    field public static final androidx.ui.geometry.Size.Companion Companion;
   }
 
   public static final class Size.Companion {
diff --git a/ui/ui-geometry/api/restricted_current.txt b/ui/ui-geometry/api/restricted_current.txt
index 6420059..f20e212 100644
--- a/ui/ui-geometry/api/restricted_current.txt
+++ b/ui/ui-geometry/api/restricted_current.txt
@@ -17,7 +17,7 @@
     method @androidx.compose.Stable public operator androidx.ui.geometry.Offset unaryMinus();
     property public final float x;
     property public final float y;
-    field public static final androidx.ui.geometry.Offset.Companion! Companion;
+    field public static final androidx.ui.geometry.Offset.Companion Companion;
   }
 
   public static final class Offset.Companion {
@@ -78,7 +78,7 @@
     method public static androidx.ui.geometry.RRect getZero();
     property public final float height;
     property public final float width;
-    field public static final androidx.ui.geometry.RRect.Companion! Companion;
+    field public static final androidx.ui.geometry.RRect.Companion Companion;
   }
 
   public static final class RRect.Companion {
@@ -135,7 +135,7 @@
     method public static String toString-impl(long $this);
     method public static long truncDiv-impl(long $this, float operand);
     method @androidx.compose.Stable public static operator long unaryMinus-impl(long $this);
-    field public static final androidx.ui.geometry.Radius.Companion! Companion;
+    field public static final androidx.ui.geometry.Radius.Companion Companion;
   }
 
   public static final class Radius.Companion {
@@ -189,7 +189,7 @@
     property public final float maxDimension;
     property public final float minDimension;
     property public final float width;
-    field public static final androidx.ui.geometry.Rect.Companion! Companion;
+    field public static final androidx.ui.geometry.Rect.Companion Companion;
   }
 
   public static final class Rect.Companion {
@@ -239,7 +239,7 @@
     property public final float maxDimension;
     property public final float minDimension;
     property public final float width;
-    field public static final androidx.ui.geometry.Size.Companion! Companion;
+    field public static final androidx.ui.geometry.Size.Companion Companion;
   }
 
   public static final class Size.Companion {
diff --git a/ui/ui-graphics/api/0.1.0-dev15.txt b/ui/ui-graphics/api/0.1.0-dev15.txt
index d402782..1412396 100644
--- a/ui/ui-graphics/api/0.1.0-dev15.txt
+++ b/ui/ui-graphics/api/0.1.0-dev15.txt
@@ -78,6 +78,8 @@
   }
 
   public enum BlendMode {
+    method public static androidx.ui.graphics.BlendMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.BlendMode[] values();
     enum_constant public static final androidx.ui.graphics.BlendMode clear;
     enum_constant public static final androidx.ui.graphics.BlendMode color;
     enum_constant public static final androidx.ui.graphics.BlendMode colorBurn;
@@ -174,6 +176,8 @@
   }
 
   public enum ClipOp {
+    method public static androidx.ui.graphics.ClipOp valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.ClipOp[] values();
     enum_constant public static final androidx.ui.graphics.ClipOp difference;
     enum_constant public static final androidx.ui.graphics.ClipOp intersect;
   }
@@ -198,7 +202,7 @@
     method public long getValue();
     method @androidx.compose.Immutable public static inline int hashCode-impl(long p);
     method public static String toString-impl(long $this);
-    field public static final androidx.ui.graphics.Color.Companion! Companion;
+    field public static final androidx.ui.graphics.Color.Companion Companion;
   }
 
   public static final class Color.Companion {
@@ -236,7 +240,7 @@
     method @androidx.compose.Immutable public androidx.ui.graphics.ColorFilter copy-vOa7YyA(long color, androidx.ui.graphics.BlendMode blendMode);
     method public androidx.ui.graphics.BlendMode getBlendMode();
     method public long getColor();
-    field public static final androidx.ui.graphics.ColorFilter.Companion! Companion;
+    field public static final androidx.ui.graphics.ColorFilter.Companion Companion;
   }
 
   public static final class ColorFilter.Companion {
@@ -258,6 +262,8 @@
   }
 
   public enum FilterQuality {
+    method public static androidx.ui.graphics.FilterQuality valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.FilterQuality[] values();
     enum_constant public static final androidx.ui.graphics.FilterQuality high;
     enum_constant public static final androidx.ui.graphics.FilterQuality low;
     enum_constant public static final androidx.ui.graphics.FilterQuality medium;
@@ -283,6 +289,8 @@
   }
 
   public enum ImageAssetConfig {
+    method public static androidx.ui.graphics.ImageAssetConfig valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.ImageAssetConfig[] values();
     enum_constant public static final androidx.ui.graphics.ImageAssetConfig Alpha8;
     enum_constant public static final androidx.ui.graphics.ImageAssetConfig Argb8888;
     enum_constant public static final androidx.ui.graphics.ImageAssetConfig F16;
@@ -376,6 +384,8 @@
   }
 
   public enum PaintingStyle {
+    method public static androidx.ui.graphics.PaintingStyle valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PaintingStyle[] values();
     enum_constant public static final androidx.ui.graphics.PaintingStyle fill;
     enum_constant public static final androidx.ui.graphics.PaintingStyle stroke;
   }
@@ -409,7 +419,7 @@
     property public abstract androidx.ui.graphics.PathFillType fillType;
     property public abstract boolean isConvex;
     property public abstract boolean isEmpty;
-    field public static final androidx.ui.graphics.Path.Companion! Companion;
+    field public static final androidx.ui.graphics.Path.Companion Companion;
   }
 
   public static final class Path.Companion {
@@ -417,11 +427,15 @@
   }
 
   public enum PathFillType {
+    method public static androidx.ui.graphics.PathFillType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PathFillType[] values();
     enum_constant public static final androidx.ui.graphics.PathFillType evenOdd;
     enum_constant public static final androidx.ui.graphics.PathFillType nonZero;
   }
 
   public enum PathOperation {
+    method public static androidx.ui.graphics.PathOperation valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PathOperation[] values();
     enum_constant public static final androidx.ui.graphics.PathOperation difference;
     enum_constant public static final androidx.ui.graphics.PathOperation intersect;
     enum_constant public static final androidx.ui.graphics.PathOperation reverseDifference;
@@ -440,6 +454,8 @@
   }
 
   public enum PointMode {
+    method public static androidx.ui.graphics.PointMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PointMode[] values();
     enum_constant public static final androidx.ui.graphics.PointMode lines;
     enum_constant public static final androidx.ui.graphics.PointMode points;
     enum_constant public static final androidx.ui.graphics.PointMode polygon;
@@ -482,7 +498,7 @@
     method public float getBlurRadius();
     method public long getColor();
     method public androidx.ui.geometry.Offset getOffset();
-    field public static final androidx.ui.graphics.Shadow.Companion! Companion;
+    field public static final androidx.ui.graphics.Shadow.Companion Companion;
   }
 
   public static final class Shadow.Companion {
@@ -506,24 +522,32 @@
   }
 
   public enum StrokeCap {
+    method public static androidx.ui.graphics.StrokeCap valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.StrokeCap[] values();
     enum_constant public static final androidx.ui.graphics.StrokeCap butt;
     enum_constant public static final androidx.ui.graphics.StrokeCap round;
     enum_constant public static final androidx.ui.graphics.StrokeCap square;
   }
 
   public enum StrokeJoin {
+    method public static androidx.ui.graphics.StrokeJoin valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.StrokeJoin[] values();
     enum_constant public static final androidx.ui.graphics.StrokeJoin bevel;
     enum_constant public static final androidx.ui.graphics.StrokeJoin miter;
     enum_constant public static final androidx.ui.graphics.StrokeJoin round;
   }
 
   public enum TileMode {
+    method public static androidx.ui.graphics.TileMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.TileMode[] values();
     enum_constant public static final androidx.ui.graphics.TileMode Clamp;
     enum_constant public static final androidx.ui.graphics.TileMode Mirror;
     enum_constant public static final androidx.ui.graphics.TileMode Repeated;
   }
 
   public enum VertexMode {
+    method public static androidx.ui.graphics.VertexMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.VertexMode[] values();
     enum_constant public static final androidx.ui.graphics.VertexMode triangleFan;
     enum_constant public static final androidx.ui.graphics.VertexMode triangleStrip;
     enum_constant public static final androidx.ui.graphics.VertexMode triangles;
@@ -547,6 +571,8 @@
 package androidx.ui.graphics.colorspace {
 
   public enum Adaptation {
+    method public static androidx.ui.graphics.colorspace.Adaptation valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.colorspace.Adaptation[] values();
     enum_constant public static final androidx.ui.graphics.colorspace.Adaptation Bradford;
     enum_constant public static final androidx.ui.graphics.colorspace.Adaptation Ciecat02;
     enum_constant public static final androidx.ui.graphics.colorspace.Adaptation VonKries;
@@ -554,6 +580,8 @@
 
   public enum ColorModel {
     method public final int getComponentCount();
+    method public static androidx.ui.graphics.colorspace.ColorModel valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.colorspace.ColorModel[] values();
     enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Cmyk;
     enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Lab;
     enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Rgb;
@@ -618,7 +646,7 @@
     property public final androidx.ui.graphics.colorspace.Rgb ProPhotoRgb;
     property public final androidx.ui.graphics.colorspace.Rgb SmpteC;
     property public final androidx.ui.graphics.colorspace.Rgb Srgb;
-    field public static final androidx.ui.graphics.colorspace.ColorSpaces! INSTANCE;
+    field public static final androidx.ui.graphics.colorspace.ColorSpaces INSTANCE;
   }
 
   public class Connector {
@@ -648,10 +676,12 @@
     property public final androidx.ui.graphics.colorspace.WhitePoint D65;
     property public final androidx.ui.graphics.colorspace.WhitePoint D75;
     property public final androidx.ui.graphics.colorspace.WhitePoint E;
-    field public static final androidx.ui.graphics.colorspace.Illuminant! INSTANCE;
+    field public static final androidx.ui.graphics.colorspace.Illuminant INSTANCE;
   }
 
   public enum RenderIntent {
+    method public static androidx.ui.graphics.colorspace.RenderIntent valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.colorspace.RenderIntent[] values();
     enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Absolute;
     enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Perceptual;
     enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Relative;
@@ -750,7 +780,7 @@
     property public final androidx.ui.geometry.Offset center;
     property public abstract androidx.ui.core.LayoutDirection layoutDirection;
     property public final androidx.ui.geometry.Size size;
-    field public static final androidx.ui.graphics.drawscope.DrawScope.Companion! Companion;
+    field public static final androidx.ui.graphics.drawscope.DrawScope.Companion Companion;
   }
 
   public static final class DrawScope.Companion {
@@ -797,7 +827,7 @@
   }
 
   public final class Fill extends androidx.ui.graphics.drawscope.DrawStyle {
-    field public static final androidx.ui.graphics.drawscope.Fill! INSTANCE;
+    field public static final androidx.ui.graphics.drawscope.Fill INSTANCE;
   }
 
   public final class Stroke extends androidx.ui.graphics.drawscope.DrawStyle {
@@ -814,7 +844,7 @@
     method public float getMiter();
     method public android.graphics.PathEffect? getPathEffect();
     method public float getWidth();
-    field public static final androidx.ui.graphics.drawscope.Stroke.Companion! Companion;
+    field public static final androidx.ui.graphics.drawscope.Stroke.Companion Companion;
     field public static final float DefaultMiter = 4.0f;
     field public static final float HairlineWidth = 0.0f;
   }
@@ -911,7 +941,7 @@
   }
 
   public static final class PathNode.Close extends androidx.ui.graphics.vector.PathNode {
-    field public static final androidx.ui.graphics.vector.PathNode.Close! INSTANCE;
+    field public static final androidx.ui.graphics.vector.PathNode.Close INSTANCE;
   }
 
   public static final class PathNode.CurveTo extends androidx.ui.graphics.vector.PathNode {
@@ -1149,7 +1179,7 @@
     method public float[] toFloatArray();
     method public operator androidx.ui.graphics.vectormath.Matrix3 unaryMinus();
     property public final inline java.util.List<java.lang.Float> m3storage;
-    field public static final androidx.ui.graphics.vectormath.Matrix3.Companion! Companion;
+    field public static final androidx.ui.graphics.vectormath.Matrix3.Companion Companion;
   }
 
   public static final class Matrix3.Companion {
@@ -1229,7 +1259,7 @@
     property public final inline androidx.ui.graphics.vectormath.Vector3 translation;
     property public final inline androidx.ui.graphics.vectormath.Vector3 up;
     property public final inline androidx.ui.graphics.vectormath.Matrix3 upperLeft;
-    field public static final androidx.ui.graphics.vectormath.Matrix4.Companion! Companion;
+    field public static final androidx.ui.graphics.vectormath.Matrix4.Companion Companion;
   }
 
   public static final class Matrix4.Companion {
@@ -1256,6 +1286,8 @@
   }
 
   public enum MatrixColumn {
+    method public static androidx.ui.graphics.vectormath.MatrixColumn valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.vectormath.MatrixColumn[] values();
     enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn W;
     enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn X;
     enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn Y;
@@ -1544,6 +1576,8 @@
   }
 
   public enum VectorComponent {
+    method public static androidx.ui.graphics.vectormath.VectorComponent valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.vectormath.VectorComponent[] values();
     enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent A;
     enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent B;
     enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent G;
diff --git a/ui/ui-graphics/api/current.txt b/ui/ui-graphics/api/current.txt
index d402782..1412396 100644
--- a/ui/ui-graphics/api/current.txt
+++ b/ui/ui-graphics/api/current.txt
@@ -78,6 +78,8 @@
   }
 
   public enum BlendMode {
+    method public static androidx.ui.graphics.BlendMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.BlendMode[] values();
     enum_constant public static final androidx.ui.graphics.BlendMode clear;
     enum_constant public static final androidx.ui.graphics.BlendMode color;
     enum_constant public static final androidx.ui.graphics.BlendMode colorBurn;
@@ -174,6 +176,8 @@
   }
 
   public enum ClipOp {
+    method public static androidx.ui.graphics.ClipOp valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.ClipOp[] values();
     enum_constant public static final androidx.ui.graphics.ClipOp difference;
     enum_constant public static final androidx.ui.graphics.ClipOp intersect;
   }
@@ -198,7 +202,7 @@
     method public long getValue();
     method @androidx.compose.Immutable public static inline int hashCode-impl(long p);
     method public static String toString-impl(long $this);
-    field public static final androidx.ui.graphics.Color.Companion! Companion;
+    field public static final androidx.ui.graphics.Color.Companion Companion;
   }
 
   public static final class Color.Companion {
@@ -236,7 +240,7 @@
     method @androidx.compose.Immutable public androidx.ui.graphics.ColorFilter copy-vOa7YyA(long color, androidx.ui.graphics.BlendMode blendMode);
     method public androidx.ui.graphics.BlendMode getBlendMode();
     method public long getColor();
-    field public static final androidx.ui.graphics.ColorFilter.Companion! Companion;
+    field public static final androidx.ui.graphics.ColorFilter.Companion Companion;
   }
 
   public static final class ColorFilter.Companion {
@@ -258,6 +262,8 @@
   }
 
   public enum FilterQuality {
+    method public static androidx.ui.graphics.FilterQuality valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.FilterQuality[] values();
     enum_constant public static final androidx.ui.graphics.FilterQuality high;
     enum_constant public static final androidx.ui.graphics.FilterQuality low;
     enum_constant public static final androidx.ui.graphics.FilterQuality medium;
@@ -283,6 +289,8 @@
   }
 
   public enum ImageAssetConfig {
+    method public static androidx.ui.graphics.ImageAssetConfig valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.ImageAssetConfig[] values();
     enum_constant public static final androidx.ui.graphics.ImageAssetConfig Alpha8;
     enum_constant public static final androidx.ui.graphics.ImageAssetConfig Argb8888;
     enum_constant public static final androidx.ui.graphics.ImageAssetConfig F16;
@@ -376,6 +384,8 @@
   }
 
   public enum PaintingStyle {
+    method public static androidx.ui.graphics.PaintingStyle valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PaintingStyle[] values();
     enum_constant public static final androidx.ui.graphics.PaintingStyle fill;
     enum_constant public static final androidx.ui.graphics.PaintingStyle stroke;
   }
@@ -409,7 +419,7 @@
     property public abstract androidx.ui.graphics.PathFillType fillType;
     property public abstract boolean isConvex;
     property public abstract boolean isEmpty;
-    field public static final androidx.ui.graphics.Path.Companion! Companion;
+    field public static final androidx.ui.graphics.Path.Companion Companion;
   }
 
   public static final class Path.Companion {
@@ -417,11 +427,15 @@
   }
 
   public enum PathFillType {
+    method public static androidx.ui.graphics.PathFillType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PathFillType[] values();
     enum_constant public static final androidx.ui.graphics.PathFillType evenOdd;
     enum_constant public static final androidx.ui.graphics.PathFillType nonZero;
   }
 
   public enum PathOperation {
+    method public static androidx.ui.graphics.PathOperation valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PathOperation[] values();
     enum_constant public static final androidx.ui.graphics.PathOperation difference;
     enum_constant public static final androidx.ui.graphics.PathOperation intersect;
     enum_constant public static final androidx.ui.graphics.PathOperation reverseDifference;
@@ -440,6 +454,8 @@
   }
 
   public enum PointMode {
+    method public static androidx.ui.graphics.PointMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PointMode[] values();
     enum_constant public static final androidx.ui.graphics.PointMode lines;
     enum_constant public static final androidx.ui.graphics.PointMode points;
     enum_constant public static final androidx.ui.graphics.PointMode polygon;
@@ -482,7 +498,7 @@
     method public float getBlurRadius();
     method public long getColor();
     method public androidx.ui.geometry.Offset getOffset();
-    field public static final androidx.ui.graphics.Shadow.Companion! Companion;
+    field public static final androidx.ui.graphics.Shadow.Companion Companion;
   }
 
   public static final class Shadow.Companion {
@@ -506,24 +522,32 @@
   }
 
   public enum StrokeCap {
+    method public static androidx.ui.graphics.StrokeCap valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.StrokeCap[] values();
     enum_constant public static final androidx.ui.graphics.StrokeCap butt;
     enum_constant public static final androidx.ui.graphics.StrokeCap round;
     enum_constant public static final androidx.ui.graphics.StrokeCap square;
   }
 
   public enum StrokeJoin {
+    method public static androidx.ui.graphics.StrokeJoin valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.StrokeJoin[] values();
     enum_constant public static final androidx.ui.graphics.StrokeJoin bevel;
     enum_constant public static final androidx.ui.graphics.StrokeJoin miter;
     enum_constant public static final androidx.ui.graphics.StrokeJoin round;
   }
 
   public enum TileMode {
+    method public static androidx.ui.graphics.TileMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.TileMode[] values();
     enum_constant public static final androidx.ui.graphics.TileMode Clamp;
     enum_constant public static final androidx.ui.graphics.TileMode Mirror;
     enum_constant public static final androidx.ui.graphics.TileMode Repeated;
   }
 
   public enum VertexMode {
+    method public static androidx.ui.graphics.VertexMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.VertexMode[] values();
     enum_constant public static final androidx.ui.graphics.VertexMode triangleFan;
     enum_constant public static final androidx.ui.graphics.VertexMode triangleStrip;
     enum_constant public static final androidx.ui.graphics.VertexMode triangles;
@@ -547,6 +571,8 @@
 package androidx.ui.graphics.colorspace {
 
   public enum Adaptation {
+    method public static androidx.ui.graphics.colorspace.Adaptation valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.colorspace.Adaptation[] values();
     enum_constant public static final androidx.ui.graphics.colorspace.Adaptation Bradford;
     enum_constant public static final androidx.ui.graphics.colorspace.Adaptation Ciecat02;
     enum_constant public static final androidx.ui.graphics.colorspace.Adaptation VonKries;
@@ -554,6 +580,8 @@
 
   public enum ColorModel {
     method public final int getComponentCount();
+    method public static androidx.ui.graphics.colorspace.ColorModel valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.colorspace.ColorModel[] values();
     enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Cmyk;
     enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Lab;
     enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Rgb;
@@ -618,7 +646,7 @@
     property public final androidx.ui.graphics.colorspace.Rgb ProPhotoRgb;
     property public final androidx.ui.graphics.colorspace.Rgb SmpteC;
     property public final androidx.ui.graphics.colorspace.Rgb Srgb;
-    field public static final androidx.ui.graphics.colorspace.ColorSpaces! INSTANCE;
+    field public static final androidx.ui.graphics.colorspace.ColorSpaces INSTANCE;
   }
 
   public class Connector {
@@ -648,10 +676,12 @@
     property public final androidx.ui.graphics.colorspace.WhitePoint D65;
     property public final androidx.ui.graphics.colorspace.WhitePoint D75;
     property public final androidx.ui.graphics.colorspace.WhitePoint E;
-    field public static final androidx.ui.graphics.colorspace.Illuminant! INSTANCE;
+    field public static final androidx.ui.graphics.colorspace.Illuminant INSTANCE;
   }
 
   public enum RenderIntent {
+    method public static androidx.ui.graphics.colorspace.RenderIntent valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.colorspace.RenderIntent[] values();
     enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Absolute;
     enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Perceptual;
     enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Relative;
@@ -750,7 +780,7 @@
     property public final androidx.ui.geometry.Offset center;
     property public abstract androidx.ui.core.LayoutDirection layoutDirection;
     property public final androidx.ui.geometry.Size size;
-    field public static final androidx.ui.graphics.drawscope.DrawScope.Companion! Companion;
+    field public static final androidx.ui.graphics.drawscope.DrawScope.Companion Companion;
   }
 
   public static final class DrawScope.Companion {
@@ -797,7 +827,7 @@
   }
 
   public final class Fill extends androidx.ui.graphics.drawscope.DrawStyle {
-    field public static final androidx.ui.graphics.drawscope.Fill! INSTANCE;
+    field public static final androidx.ui.graphics.drawscope.Fill INSTANCE;
   }
 
   public final class Stroke extends androidx.ui.graphics.drawscope.DrawStyle {
@@ -814,7 +844,7 @@
     method public float getMiter();
     method public android.graphics.PathEffect? getPathEffect();
     method public float getWidth();
-    field public static final androidx.ui.graphics.drawscope.Stroke.Companion! Companion;
+    field public static final androidx.ui.graphics.drawscope.Stroke.Companion Companion;
     field public static final float DefaultMiter = 4.0f;
     field public static final float HairlineWidth = 0.0f;
   }
@@ -911,7 +941,7 @@
   }
 
   public static final class PathNode.Close extends androidx.ui.graphics.vector.PathNode {
-    field public static final androidx.ui.graphics.vector.PathNode.Close! INSTANCE;
+    field public static final androidx.ui.graphics.vector.PathNode.Close INSTANCE;
   }
 
   public static final class PathNode.CurveTo extends androidx.ui.graphics.vector.PathNode {
@@ -1149,7 +1179,7 @@
     method public float[] toFloatArray();
     method public operator androidx.ui.graphics.vectormath.Matrix3 unaryMinus();
     property public final inline java.util.List<java.lang.Float> m3storage;
-    field public static final androidx.ui.graphics.vectormath.Matrix3.Companion! Companion;
+    field public static final androidx.ui.graphics.vectormath.Matrix3.Companion Companion;
   }
 
   public static final class Matrix3.Companion {
@@ -1229,7 +1259,7 @@
     property public final inline androidx.ui.graphics.vectormath.Vector3 translation;
     property public final inline androidx.ui.graphics.vectormath.Vector3 up;
     property public final inline androidx.ui.graphics.vectormath.Matrix3 upperLeft;
-    field public static final androidx.ui.graphics.vectormath.Matrix4.Companion! Companion;
+    field public static final androidx.ui.graphics.vectormath.Matrix4.Companion Companion;
   }
 
   public static final class Matrix4.Companion {
@@ -1256,6 +1286,8 @@
   }
 
   public enum MatrixColumn {
+    method public static androidx.ui.graphics.vectormath.MatrixColumn valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.vectormath.MatrixColumn[] values();
     enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn W;
     enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn X;
     enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn Y;
@@ -1544,6 +1576,8 @@
   }
 
   public enum VectorComponent {
+    method public static androidx.ui.graphics.vectormath.VectorComponent valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.vectormath.VectorComponent[] values();
     enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent A;
     enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent B;
     enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent G;
diff --git a/ui/ui-graphics/api/public_plus_experimental_0.1.0-dev15.txt b/ui/ui-graphics/api/public_plus_experimental_0.1.0-dev15.txt
index d402782..1412396 100644
--- a/ui/ui-graphics/api/public_plus_experimental_0.1.0-dev15.txt
+++ b/ui/ui-graphics/api/public_plus_experimental_0.1.0-dev15.txt
@@ -78,6 +78,8 @@
   }
 
   public enum BlendMode {
+    method public static androidx.ui.graphics.BlendMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.BlendMode[] values();
     enum_constant public static final androidx.ui.graphics.BlendMode clear;
     enum_constant public static final androidx.ui.graphics.BlendMode color;
     enum_constant public static final androidx.ui.graphics.BlendMode colorBurn;
@@ -174,6 +176,8 @@
   }
 
   public enum ClipOp {
+    method public static androidx.ui.graphics.ClipOp valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.ClipOp[] values();
     enum_constant public static final androidx.ui.graphics.ClipOp difference;
     enum_constant public static final androidx.ui.graphics.ClipOp intersect;
   }
@@ -198,7 +202,7 @@
     method public long getValue();
     method @androidx.compose.Immutable public static inline int hashCode-impl(long p);
     method public static String toString-impl(long $this);
-    field public static final androidx.ui.graphics.Color.Companion! Companion;
+    field public static final androidx.ui.graphics.Color.Companion Companion;
   }
 
   public static final class Color.Companion {
@@ -236,7 +240,7 @@
     method @androidx.compose.Immutable public androidx.ui.graphics.ColorFilter copy-vOa7YyA(long color, androidx.ui.graphics.BlendMode blendMode);
     method public androidx.ui.graphics.BlendMode getBlendMode();
     method public long getColor();
-    field public static final androidx.ui.graphics.ColorFilter.Companion! Companion;
+    field public static final androidx.ui.graphics.ColorFilter.Companion Companion;
   }
 
   public static final class ColorFilter.Companion {
@@ -258,6 +262,8 @@
   }
 
   public enum FilterQuality {
+    method public static androidx.ui.graphics.FilterQuality valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.FilterQuality[] values();
     enum_constant public static final androidx.ui.graphics.FilterQuality high;
     enum_constant public static final androidx.ui.graphics.FilterQuality low;
     enum_constant public static final androidx.ui.graphics.FilterQuality medium;
@@ -283,6 +289,8 @@
   }
 
   public enum ImageAssetConfig {
+    method public static androidx.ui.graphics.ImageAssetConfig valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.ImageAssetConfig[] values();
     enum_constant public static final androidx.ui.graphics.ImageAssetConfig Alpha8;
     enum_constant public static final androidx.ui.graphics.ImageAssetConfig Argb8888;
     enum_constant public static final androidx.ui.graphics.ImageAssetConfig F16;
@@ -376,6 +384,8 @@
   }
 
   public enum PaintingStyle {
+    method public static androidx.ui.graphics.PaintingStyle valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PaintingStyle[] values();
     enum_constant public static final androidx.ui.graphics.PaintingStyle fill;
     enum_constant public static final androidx.ui.graphics.PaintingStyle stroke;
   }
@@ -409,7 +419,7 @@
     property public abstract androidx.ui.graphics.PathFillType fillType;
     property public abstract boolean isConvex;
     property public abstract boolean isEmpty;
-    field public static final androidx.ui.graphics.Path.Companion! Companion;
+    field public static final androidx.ui.graphics.Path.Companion Companion;
   }
 
   public static final class Path.Companion {
@@ -417,11 +427,15 @@
   }
 
   public enum PathFillType {
+    method public static androidx.ui.graphics.PathFillType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PathFillType[] values();
     enum_constant public static final androidx.ui.graphics.PathFillType evenOdd;
     enum_constant public static final androidx.ui.graphics.PathFillType nonZero;
   }
 
   public enum PathOperation {
+    method public static androidx.ui.graphics.PathOperation valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PathOperation[] values();
     enum_constant public static final androidx.ui.graphics.PathOperation difference;
     enum_constant public static final androidx.ui.graphics.PathOperation intersect;
     enum_constant public static final androidx.ui.graphics.PathOperation reverseDifference;
@@ -440,6 +454,8 @@
   }
 
   public enum PointMode {
+    method public static androidx.ui.graphics.PointMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PointMode[] values();
     enum_constant public static final androidx.ui.graphics.PointMode lines;
     enum_constant public static final androidx.ui.graphics.PointMode points;
     enum_constant public static final androidx.ui.graphics.PointMode polygon;
@@ -482,7 +498,7 @@
     method public float getBlurRadius();
     method public long getColor();
     method public androidx.ui.geometry.Offset getOffset();
-    field public static final androidx.ui.graphics.Shadow.Companion! Companion;
+    field public static final androidx.ui.graphics.Shadow.Companion Companion;
   }
 
   public static final class Shadow.Companion {
@@ -506,24 +522,32 @@
   }
 
   public enum StrokeCap {
+    method public static androidx.ui.graphics.StrokeCap valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.StrokeCap[] values();
     enum_constant public static final androidx.ui.graphics.StrokeCap butt;
     enum_constant public static final androidx.ui.graphics.StrokeCap round;
     enum_constant public static final androidx.ui.graphics.StrokeCap square;
   }
 
   public enum StrokeJoin {
+    method public static androidx.ui.graphics.StrokeJoin valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.StrokeJoin[] values();
     enum_constant public static final androidx.ui.graphics.StrokeJoin bevel;
     enum_constant public static final androidx.ui.graphics.StrokeJoin miter;
     enum_constant public static final androidx.ui.graphics.StrokeJoin round;
   }
 
   public enum TileMode {
+    method public static androidx.ui.graphics.TileMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.TileMode[] values();
     enum_constant public static final androidx.ui.graphics.TileMode Clamp;
     enum_constant public static final androidx.ui.graphics.TileMode Mirror;
     enum_constant public static final androidx.ui.graphics.TileMode Repeated;
   }
 
   public enum VertexMode {
+    method public static androidx.ui.graphics.VertexMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.VertexMode[] values();
     enum_constant public static final androidx.ui.graphics.VertexMode triangleFan;
     enum_constant public static final androidx.ui.graphics.VertexMode triangleStrip;
     enum_constant public static final androidx.ui.graphics.VertexMode triangles;
@@ -547,6 +571,8 @@
 package androidx.ui.graphics.colorspace {
 
   public enum Adaptation {
+    method public static androidx.ui.graphics.colorspace.Adaptation valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.colorspace.Adaptation[] values();
     enum_constant public static final androidx.ui.graphics.colorspace.Adaptation Bradford;
     enum_constant public static final androidx.ui.graphics.colorspace.Adaptation Ciecat02;
     enum_constant public static final androidx.ui.graphics.colorspace.Adaptation VonKries;
@@ -554,6 +580,8 @@
 
   public enum ColorModel {
     method public final int getComponentCount();
+    method public static androidx.ui.graphics.colorspace.ColorModel valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.colorspace.ColorModel[] values();
     enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Cmyk;
     enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Lab;
     enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Rgb;
@@ -618,7 +646,7 @@
     property public final androidx.ui.graphics.colorspace.Rgb ProPhotoRgb;
     property public final androidx.ui.graphics.colorspace.Rgb SmpteC;
     property public final androidx.ui.graphics.colorspace.Rgb Srgb;
-    field public static final androidx.ui.graphics.colorspace.ColorSpaces! INSTANCE;
+    field public static final androidx.ui.graphics.colorspace.ColorSpaces INSTANCE;
   }
 
   public class Connector {
@@ -648,10 +676,12 @@
     property public final androidx.ui.graphics.colorspace.WhitePoint D65;
     property public final androidx.ui.graphics.colorspace.WhitePoint D75;
     property public final androidx.ui.graphics.colorspace.WhitePoint E;
-    field public static final androidx.ui.graphics.colorspace.Illuminant! INSTANCE;
+    field public static final androidx.ui.graphics.colorspace.Illuminant INSTANCE;
   }
 
   public enum RenderIntent {
+    method public static androidx.ui.graphics.colorspace.RenderIntent valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.colorspace.RenderIntent[] values();
     enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Absolute;
     enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Perceptual;
     enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Relative;
@@ -750,7 +780,7 @@
     property public final androidx.ui.geometry.Offset center;
     property public abstract androidx.ui.core.LayoutDirection layoutDirection;
     property public final androidx.ui.geometry.Size size;
-    field public static final androidx.ui.graphics.drawscope.DrawScope.Companion! Companion;
+    field public static final androidx.ui.graphics.drawscope.DrawScope.Companion Companion;
   }
 
   public static final class DrawScope.Companion {
@@ -797,7 +827,7 @@
   }
 
   public final class Fill extends androidx.ui.graphics.drawscope.DrawStyle {
-    field public static final androidx.ui.graphics.drawscope.Fill! INSTANCE;
+    field public static final androidx.ui.graphics.drawscope.Fill INSTANCE;
   }
 
   public final class Stroke extends androidx.ui.graphics.drawscope.DrawStyle {
@@ -814,7 +844,7 @@
     method public float getMiter();
     method public android.graphics.PathEffect? getPathEffect();
     method public float getWidth();
-    field public static final androidx.ui.graphics.drawscope.Stroke.Companion! Companion;
+    field public static final androidx.ui.graphics.drawscope.Stroke.Companion Companion;
     field public static final float DefaultMiter = 4.0f;
     field public static final float HairlineWidth = 0.0f;
   }
@@ -911,7 +941,7 @@
   }
 
   public static final class PathNode.Close extends androidx.ui.graphics.vector.PathNode {
-    field public static final androidx.ui.graphics.vector.PathNode.Close! INSTANCE;
+    field public static final androidx.ui.graphics.vector.PathNode.Close INSTANCE;
   }
 
   public static final class PathNode.CurveTo extends androidx.ui.graphics.vector.PathNode {
@@ -1149,7 +1179,7 @@
     method public float[] toFloatArray();
     method public operator androidx.ui.graphics.vectormath.Matrix3 unaryMinus();
     property public final inline java.util.List<java.lang.Float> m3storage;
-    field public static final androidx.ui.graphics.vectormath.Matrix3.Companion! Companion;
+    field public static final androidx.ui.graphics.vectormath.Matrix3.Companion Companion;
   }
 
   public static final class Matrix3.Companion {
@@ -1229,7 +1259,7 @@
     property public final inline androidx.ui.graphics.vectormath.Vector3 translation;
     property public final inline androidx.ui.graphics.vectormath.Vector3 up;
     property public final inline androidx.ui.graphics.vectormath.Matrix3 upperLeft;
-    field public static final androidx.ui.graphics.vectormath.Matrix4.Companion! Companion;
+    field public static final androidx.ui.graphics.vectormath.Matrix4.Companion Companion;
   }
 
   public static final class Matrix4.Companion {
@@ -1256,6 +1286,8 @@
   }
 
   public enum MatrixColumn {
+    method public static androidx.ui.graphics.vectormath.MatrixColumn valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.vectormath.MatrixColumn[] values();
     enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn W;
     enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn X;
     enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn Y;
@@ -1544,6 +1576,8 @@
   }
 
   public enum VectorComponent {
+    method public static androidx.ui.graphics.vectormath.VectorComponent valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.vectormath.VectorComponent[] values();
     enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent A;
     enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent B;
     enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent G;
diff --git a/ui/ui-graphics/api/public_plus_experimental_current.txt b/ui/ui-graphics/api/public_plus_experimental_current.txt
index d402782..1412396 100644
--- a/ui/ui-graphics/api/public_plus_experimental_current.txt
+++ b/ui/ui-graphics/api/public_plus_experimental_current.txt
@@ -78,6 +78,8 @@
   }
 
   public enum BlendMode {
+    method public static androidx.ui.graphics.BlendMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.BlendMode[] values();
     enum_constant public static final androidx.ui.graphics.BlendMode clear;
     enum_constant public static final androidx.ui.graphics.BlendMode color;
     enum_constant public static final androidx.ui.graphics.BlendMode colorBurn;
@@ -174,6 +176,8 @@
   }
 
   public enum ClipOp {
+    method public static androidx.ui.graphics.ClipOp valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.ClipOp[] values();
     enum_constant public static final androidx.ui.graphics.ClipOp difference;
     enum_constant public static final androidx.ui.graphics.ClipOp intersect;
   }
@@ -198,7 +202,7 @@
     method public long getValue();
     method @androidx.compose.Immutable public static inline int hashCode-impl(long p);
     method public static String toString-impl(long $this);
-    field public static final androidx.ui.graphics.Color.Companion! Companion;
+    field public static final androidx.ui.graphics.Color.Companion Companion;
   }
 
   public static final class Color.Companion {
@@ -236,7 +240,7 @@
     method @androidx.compose.Immutable public androidx.ui.graphics.ColorFilter copy-vOa7YyA(long color, androidx.ui.graphics.BlendMode blendMode);
     method public androidx.ui.graphics.BlendMode getBlendMode();
     method public long getColor();
-    field public static final androidx.ui.graphics.ColorFilter.Companion! Companion;
+    field public static final androidx.ui.graphics.ColorFilter.Companion Companion;
   }
 
   public static final class ColorFilter.Companion {
@@ -258,6 +262,8 @@
   }
 
   public enum FilterQuality {
+    method public static androidx.ui.graphics.FilterQuality valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.FilterQuality[] values();
     enum_constant public static final androidx.ui.graphics.FilterQuality high;
     enum_constant public static final androidx.ui.graphics.FilterQuality low;
     enum_constant public static final androidx.ui.graphics.FilterQuality medium;
@@ -283,6 +289,8 @@
   }
 
   public enum ImageAssetConfig {
+    method public static androidx.ui.graphics.ImageAssetConfig valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.ImageAssetConfig[] values();
     enum_constant public static final androidx.ui.graphics.ImageAssetConfig Alpha8;
     enum_constant public static final androidx.ui.graphics.ImageAssetConfig Argb8888;
     enum_constant public static final androidx.ui.graphics.ImageAssetConfig F16;
@@ -376,6 +384,8 @@
   }
 
   public enum PaintingStyle {
+    method public static androidx.ui.graphics.PaintingStyle valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PaintingStyle[] values();
     enum_constant public static final androidx.ui.graphics.PaintingStyle fill;
     enum_constant public static final androidx.ui.graphics.PaintingStyle stroke;
   }
@@ -409,7 +419,7 @@
     property public abstract androidx.ui.graphics.PathFillType fillType;
     property public abstract boolean isConvex;
     property public abstract boolean isEmpty;
-    field public static final androidx.ui.graphics.Path.Companion! Companion;
+    field public static final androidx.ui.graphics.Path.Companion Companion;
   }
 
   public static final class Path.Companion {
@@ -417,11 +427,15 @@
   }
 
   public enum PathFillType {
+    method public static androidx.ui.graphics.PathFillType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PathFillType[] values();
     enum_constant public static final androidx.ui.graphics.PathFillType evenOdd;
     enum_constant public static final androidx.ui.graphics.PathFillType nonZero;
   }
 
   public enum PathOperation {
+    method public static androidx.ui.graphics.PathOperation valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PathOperation[] values();
     enum_constant public static final androidx.ui.graphics.PathOperation difference;
     enum_constant public static final androidx.ui.graphics.PathOperation intersect;
     enum_constant public static final androidx.ui.graphics.PathOperation reverseDifference;
@@ -440,6 +454,8 @@
   }
 
   public enum PointMode {
+    method public static androidx.ui.graphics.PointMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PointMode[] values();
     enum_constant public static final androidx.ui.graphics.PointMode lines;
     enum_constant public static final androidx.ui.graphics.PointMode points;
     enum_constant public static final androidx.ui.graphics.PointMode polygon;
@@ -482,7 +498,7 @@
     method public float getBlurRadius();
     method public long getColor();
     method public androidx.ui.geometry.Offset getOffset();
-    field public static final androidx.ui.graphics.Shadow.Companion! Companion;
+    field public static final androidx.ui.graphics.Shadow.Companion Companion;
   }
 
   public static final class Shadow.Companion {
@@ -506,24 +522,32 @@
   }
 
   public enum StrokeCap {
+    method public static androidx.ui.graphics.StrokeCap valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.StrokeCap[] values();
     enum_constant public static final androidx.ui.graphics.StrokeCap butt;
     enum_constant public static final androidx.ui.graphics.StrokeCap round;
     enum_constant public static final androidx.ui.graphics.StrokeCap square;
   }
 
   public enum StrokeJoin {
+    method public static androidx.ui.graphics.StrokeJoin valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.StrokeJoin[] values();
     enum_constant public static final androidx.ui.graphics.StrokeJoin bevel;
     enum_constant public static final androidx.ui.graphics.StrokeJoin miter;
     enum_constant public static final androidx.ui.graphics.StrokeJoin round;
   }
 
   public enum TileMode {
+    method public static androidx.ui.graphics.TileMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.TileMode[] values();
     enum_constant public static final androidx.ui.graphics.TileMode Clamp;
     enum_constant public static final androidx.ui.graphics.TileMode Mirror;
     enum_constant public static final androidx.ui.graphics.TileMode Repeated;
   }
 
   public enum VertexMode {
+    method public static androidx.ui.graphics.VertexMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.VertexMode[] values();
     enum_constant public static final androidx.ui.graphics.VertexMode triangleFan;
     enum_constant public static final androidx.ui.graphics.VertexMode triangleStrip;
     enum_constant public static final androidx.ui.graphics.VertexMode triangles;
@@ -547,6 +571,8 @@
 package androidx.ui.graphics.colorspace {
 
   public enum Adaptation {
+    method public static androidx.ui.graphics.colorspace.Adaptation valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.colorspace.Adaptation[] values();
     enum_constant public static final androidx.ui.graphics.colorspace.Adaptation Bradford;
     enum_constant public static final androidx.ui.graphics.colorspace.Adaptation Ciecat02;
     enum_constant public static final androidx.ui.graphics.colorspace.Adaptation VonKries;
@@ -554,6 +580,8 @@
 
   public enum ColorModel {
     method public final int getComponentCount();
+    method public static androidx.ui.graphics.colorspace.ColorModel valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.colorspace.ColorModel[] values();
     enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Cmyk;
     enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Lab;
     enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Rgb;
@@ -618,7 +646,7 @@
     property public final androidx.ui.graphics.colorspace.Rgb ProPhotoRgb;
     property public final androidx.ui.graphics.colorspace.Rgb SmpteC;
     property public final androidx.ui.graphics.colorspace.Rgb Srgb;
-    field public static final androidx.ui.graphics.colorspace.ColorSpaces! INSTANCE;
+    field public static final androidx.ui.graphics.colorspace.ColorSpaces INSTANCE;
   }
 
   public class Connector {
@@ -648,10 +676,12 @@
     property public final androidx.ui.graphics.colorspace.WhitePoint D65;
     property public final androidx.ui.graphics.colorspace.WhitePoint D75;
     property public final androidx.ui.graphics.colorspace.WhitePoint E;
-    field public static final androidx.ui.graphics.colorspace.Illuminant! INSTANCE;
+    field public static final androidx.ui.graphics.colorspace.Illuminant INSTANCE;
   }
 
   public enum RenderIntent {
+    method public static androidx.ui.graphics.colorspace.RenderIntent valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.colorspace.RenderIntent[] values();
     enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Absolute;
     enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Perceptual;
     enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Relative;
@@ -750,7 +780,7 @@
     property public final androidx.ui.geometry.Offset center;
     property public abstract androidx.ui.core.LayoutDirection layoutDirection;
     property public final androidx.ui.geometry.Size size;
-    field public static final androidx.ui.graphics.drawscope.DrawScope.Companion! Companion;
+    field public static final androidx.ui.graphics.drawscope.DrawScope.Companion Companion;
   }
 
   public static final class DrawScope.Companion {
@@ -797,7 +827,7 @@
   }
 
   public final class Fill extends androidx.ui.graphics.drawscope.DrawStyle {
-    field public static final androidx.ui.graphics.drawscope.Fill! INSTANCE;
+    field public static final androidx.ui.graphics.drawscope.Fill INSTANCE;
   }
 
   public final class Stroke extends androidx.ui.graphics.drawscope.DrawStyle {
@@ -814,7 +844,7 @@
     method public float getMiter();
     method public android.graphics.PathEffect? getPathEffect();
     method public float getWidth();
-    field public static final androidx.ui.graphics.drawscope.Stroke.Companion! Companion;
+    field public static final androidx.ui.graphics.drawscope.Stroke.Companion Companion;
     field public static final float DefaultMiter = 4.0f;
     field public static final float HairlineWidth = 0.0f;
   }
@@ -911,7 +941,7 @@
   }
 
   public static final class PathNode.Close extends androidx.ui.graphics.vector.PathNode {
-    field public static final androidx.ui.graphics.vector.PathNode.Close! INSTANCE;
+    field public static final androidx.ui.graphics.vector.PathNode.Close INSTANCE;
   }
 
   public static final class PathNode.CurveTo extends androidx.ui.graphics.vector.PathNode {
@@ -1149,7 +1179,7 @@
     method public float[] toFloatArray();
     method public operator androidx.ui.graphics.vectormath.Matrix3 unaryMinus();
     property public final inline java.util.List<java.lang.Float> m3storage;
-    field public static final androidx.ui.graphics.vectormath.Matrix3.Companion! Companion;
+    field public static final androidx.ui.graphics.vectormath.Matrix3.Companion Companion;
   }
 
   public static final class Matrix3.Companion {
@@ -1229,7 +1259,7 @@
     property public final inline androidx.ui.graphics.vectormath.Vector3 translation;
     property public final inline androidx.ui.graphics.vectormath.Vector3 up;
     property public final inline androidx.ui.graphics.vectormath.Matrix3 upperLeft;
-    field public static final androidx.ui.graphics.vectormath.Matrix4.Companion! Companion;
+    field public static final androidx.ui.graphics.vectormath.Matrix4.Companion Companion;
   }
 
   public static final class Matrix4.Companion {
@@ -1256,6 +1286,8 @@
   }
 
   public enum MatrixColumn {
+    method public static androidx.ui.graphics.vectormath.MatrixColumn valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.vectormath.MatrixColumn[] values();
     enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn W;
     enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn X;
     enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn Y;
@@ -1544,6 +1576,8 @@
   }
 
   public enum VectorComponent {
+    method public static androidx.ui.graphics.vectormath.VectorComponent valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.vectormath.VectorComponent[] values();
     enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent A;
     enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent B;
     enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent G;
diff --git a/ui/ui-graphics/api/restricted_0.1.0-dev15.txt b/ui/ui-graphics/api/restricted_0.1.0-dev15.txt
index 79ad302..44804d8 100644
--- a/ui/ui-graphics/api/restricted_0.1.0-dev15.txt
+++ b/ui/ui-graphics/api/restricted_0.1.0-dev15.txt
@@ -110,6 +110,8 @@
   }
 
   public enum BlendMode {
+    method public static androidx.ui.graphics.BlendMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.BlendMode[] values();
     enum_constant public static final androidx.ui.graphics.BlendMode clear;
     enum_constant public static final androidx.ui.graphics.BlendMode color;
     enum_constant public static final androidx.ui.graphics.BlendMode colorBurn;
@@ -207,6 +209,8 @@
   }
 
   public enum ClipOp {
+    method public static androidx.ui.graphics.ClipOp valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.ClipOp[] values();
     enum_constant public static final androidx.ui.graphics.ClipOp difference;
     enum_constant public static final androidx.ui.graphics.ClipOp intersect;
   }
@@ -231,7 +235,7 @@
     method public long getValue();
     method @androidx.compose.Immutable public static inline int hashCode-impl(long p);
     method public static String toString-impl(long $this);
-    field public static final androidx.ui.graphics.Color.Companion! Companion;
+    field public static final androidx.ui.graphics.Color.Companion Companion;
   }
 
   public static final class Color.Companion {
@@ -269,7 +273,7 @@
     method @androidx.compose.Immutable public androidx.ui.graphics.ColorFilter copy-vOa7YyA(long color, androidx.ui.graphics.BlendMode blendMode);
     method public androidx.ui.graphics.BlendMode getBlendMode();
     method public long getColor();
-    field public static final androidx.ui.graphics.ColorFilter.Companion! Companion;
+    field public static final androidx.ui.graphics.ColorFilter.Companion Companion;
   }
 
   public static final class ColorFilter.Companion {
@@ -291,6 +295,8 @@
   }
 
   public enum FilterQuality {
+    method public static androidx.ui.graphics.FilterQuality valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.FilterQuality[] values();
     enum_constant public static final androidx.ui.graphics.FilterQuality high;
     enum_constant public static final androidx.ui.graphics.FilterQuality low;
     enum_constant public static final androidx.ui.graphics.FilterQuality medium;
@@ -316,6 +322,8 @@
   }
 
   public enum ImageAssetConfig {
+    method public static androidx.ui.graphics.ImageAssetConfig valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.ImageAssetConfig[] values();
     enum_constant public static final androidx.ui.graphics.ImageAssetConfig Alpha8;
     enum_constant public static final androidx.ui.graphics.ImageAssetConfig Argb8888;
     enum_constant public static final androidx.ui.graphics.ImageAssetConfig F16;
@@ -409,6 +417,8 @@
   }
 
   public enum PaintingStyle {
+    method public static androidx.ui.graphics.PaintingStyle valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PaintingStyle[] values();
     enum_constant public static final androidx.ui.graphics.PaintingStyle fill;
     enum_constant public static final androidx.ui.graphics.PaintingStyle stroke;
   }
@@ -442,7 +452,7 @@
     property public abstract androidx.ui.graphics.PathFillType fillType;
     property public abstract boolean isConvex;
     property public abstract boolean isEmpty;
-    field public static final androidx.ui.graphics.Path.Companion! Companion;
+    field public static final androidx.ui.graphics.Path.Companion Companion;
   }
 
   public static final class Path.Companion {
@@ -450,11 +460,15 @@
   }
 
   public enum PathFillType {
+    method public static androidx.ui.graphics.PathFillType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PathFillType[] values();
     enum_constant public static final androidx.ui.graphics.PathFillType evenOdd;
     enum_constant public static final androidx.ui.graphics.PathFillType nonZero;
   }
 
   public enum PathOperation {
+    method public static androidx.ui.graphics.PathOperation valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PathOperation[] values();
     enum_constant public static final androidx.ui.graphics.PathOperation difference;
     enum_constant public static final androidx.ui.graphics.PathOperation intersect;
     enum_constant public static final androidx.ui.graphics.PathOperation reverseDifference;
@@ -473,6 +487,8 @@
   }
 
   public enum PointMode {
+    method public static androidx.ui.graphics.PointMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PointMode[] values();
     enum_constant public static final androidx.ui.graphics.PointMode lines;
     enum_constant public static final androidx.ui.graphics.PointMode points;
     enum_constant public static final androidx.ui.graphics.PointMode polygon;
@@ -515,7 +531,7 @@
     method public float getBlurRadius();
     method public long getColor();
     method public androidx.ui.geometry.Offset getOffset();
-    field public static final androidx.ui.graphics.Shadow.Companion! Companion;
+    field public static final androidx.ui.graphics.Shadow.Companion Companion;
   }
 
   public static final class Shadow.Companion {
@@ -539,24 +555,32 @@
   }
 
   public enum StrokeCap {
+    method public static androidx.ui.graphics.StrokeCap valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.StrokeCap[] values();
     enum_constant public static final androidx.ui.graphics.StrokeCap butt;
     enum_constant public static final androidx.ui.graphics.StrokeCap round;
     enum_constant public static final androidx.ui.graphics.StrokeCap square;
   }
 
   public enum StrokeJoin {
+    method public static androidx.ui.graphics.StrokeJoin valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.StrokeJoin[] values();
     enum_constant public static final androidx.ui.graphics.StrokeJoin bevel;
     enum_constant public static final androidx.ui.graphics.StrokeJoin miter;
     enum_constant public static final androidx.ui.graphics.StrokeJoin round;
   }
 
   public enum TileMode {
+    method public static androidx.ui.graphics.TileMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.TileMode[] values();
     enum_constant public static final androidx.ui.graphics.TileMode Clamp;
     enum_constant public static final androidx.ui.graphics.TileMode Mirror;
     enum_constant public static final androidx.ui.graphics.TileMode Repeated;
   }
 
   public enum VertexMode {
+    method public static androidx.ui.graphics.VertexMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.VertexMode[] values();
     enum_constant public static final androidx.ui.graphics.VertexMode triangleFan;
     enum_constant public static final androidx.ui.graphics.VertexMode triangleStrip;
     enum_constant public static final androidx.ui.graphics.VertexMode triangles;
@@ -580,6 +604,8 @@
 package androidx.ui.graphics.colorspace {
 
   public enum Adaptation {
+    method public static androidx.ui.graphics.colorspace.Adaptation valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.colorspace.Adaptation[] values();
     enum_constant public static final androidx.ui.graphics.colorspace.Adaptation Bradford;
     enum_constant public static final androidx.ui.graphics.colorspace.Adaptation Ciecat02;
     enum_constant public static final androidx.ui.graphics.colorspace.Adaptation VonKries;
@@ -587,6 +613,8 @@
 
   public enum ColorModel {
     method public final int getComponentCount();
+    method public static androidx.ui.graphics.colorspace.ColorModel valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.colorspace.ColorModel[] values();
     enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Cmyk;
     enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Lab;
     enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Rgb;
@@ -651,7 +679,7 @@
     property public final androidx.ui.graphics.colorspace.Rgb ProPhotoRgb;
     property public final androidx.ui.graphics.colorspace.Rgb SmpteC;
     property public final androidx.ui.graphics.colorspace.Rgb Srgb;
-    field public static final androidx.ui.graphics.colorspace.ColorSpaces! INSTANCE;
+    field public static final androidx.ui.graphics.colorspace.ColorSpaces INSTANCE;
   }
 
   public class Connector {
@@ -681,10 +709,12 @@
     property public final androidx.ui.graphics.colorspace.WhitePoint D65;
     property public final androidx.ui.graphics.colorspace.WhitePoint D75;
     property public final androidx.ui.graphics.colorspace.WhitePoint E;
-    field public static final androidx.ui.graphics.colorspace.Illuminant! INSTANCE;
+    field public static final androidx.ui.graphics.colorspace.Illuminant INSTANCE;
   }
 
   public enum RenderIntent {
+    method public static androidx.ui.graphics.colorspace.RenderIntent valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.colorspace.RenderIntent[] values();
     enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Absolute;
     enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Perceptual;
     enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Relative;
@@ -784,7 +814,7 @@
     property public final androidx.ui.geometry.Offset center;
     property public abstract androidx.ui.core.LayoutDirection layoutDirection;
     property public final androidx.ui.geometry.Size size;
-    field public static final androidx.ui.graphics.drawscope.DrawScope.Companion! Companion;
+    field public static final androidx.ui.graphics.drawscope.DrawScope.Companion Companion;
     field @kotlin.PublishedApi internal androidx.ui.graphics.Canvas canvas;
     field @kotlin.PublishedApi internal final androidx.ui.graphics.drawscope.DrawTransform transform;
   }
@@ -833,7 +863,7 @@
   }
 
   public final class Fill extends androidx.ui.graphics.drawscope.DrawStyle {
-    field public static final androidx.ui.graphics.drawscope.Fill! INSTANCE;
+    field public static final androidx.ui.graphics.drawscope.Fill INSTANCE;
   }
 
   public final class Stroke extends androidx.ui.graphics.drawscope.DrawStyle {
@@ -850,7 +880,7 @@
     method public float getMiter();
     method public android.graphics.PathEffect? getPathEffect();
     method public float getWidth();
-    field public static final androidx.ui.graphics.drawscope.Stroke.Companion! Companion;
+    field public static final androidx.ui.graphics.drawscope.Stroke.Companion Companion;
     field public static final float DefaultMiter = 4.0f;
     field public static final float HairlineWidth = 0.0f;
   }
@@ -947,7 +977,7 @@
   }
 
   public static final class PathNode.Close extends androidx.ui.graphics.vector.PathNode {
-    field public static final androidx.ui.graphics.vector.PathNode.Close! INSTANCE;
+    field public static final androidx.ui.graphics.vector.PathNode.Close INSTANCE;
   }
 
   public static final class PathNode.CurveTo extends androidx.ui.graphics.vector.PathNode {
@@ -1185,7 +1215,7 @@
     method public float[] toFloatArray();
     method public operator androidx.ui.graphics.vectormath.Matrix3 unaryMinus();
     property public final inline java.util.List<java.lang.Float> m3storage;
-    field public static final androidx.ui.graphics.vectormath.Matrix3.Companion! Companion;
+    field public static final androidx.ui.graphics.vectormath.Matrix3.Companion Companion;
   }
 
   public static final class Matrix3.Companion {
@@ -1265,7 +1295,7 @@
     property public final inline androidx.ui.graphics.vectormath.Vector3 translation;
     property public final inline androidx.ui.graphics.vectormath.Vector3 up;
     property public final inline androidx.ui.graphics.vectormath.Matrix3 upperLeft;
-    field public static final androidx.ui.graphics.vectormath.Matrix4.Companion! Companion;
+    field public static final androidx.ui.graphics.vectormath.Matrix4.Companion Companion;
   }
 
   public static final class Matrix4.Companion {
@@ -1292,6 +1322,8 @@
   }
 
   public enum MatrixColumn {
+    method public static androidx.ui.graphics.vectormath.MatrixColumn valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.vectormath.MatrixColumn[] values();
     enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn W;
     enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn X;
     enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn Y;
@@ -1580,6 +1612,8 @@
   }
 
   public enum VectorComponent {
+    method public static androidx.ui.graphics.vectormath.VectorComponent valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.vectormath.VectorComponent[] values();
     enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent A;
     enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent B;
     enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent G;
diff --git a/ui/ui-graphics/api/restricted_current.txt b/ui/ui-graphics/api/restricted_current.txt
index 79ad302..44804d8 100644
--- a/ui/ui-graphics/api/restricted_current.txt
+++ b/ui/ui-graphics/api/restricted_current.txt
@@ -110,6 +110,8 @@
   }
 
   public enum BlendMode {
+    method public static androidx.ui.graphics.BlendMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.BlendMode[] values();
     enum_constant public static final androidx.ui.graphics.BlendMode clear;
     enum_constant public static final androidx.ui.graphics.BlendMode color;
     enum_constant public static final androidx.ui.graphics.BlendMode colorBurn;
@@ -207,6 +209,8 @@
   }
 
   public enum ClipOp {
+    method public static androidx.ui.graphics.ClipOp valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.ClipOp[] values();
     enum_constant public static final androidx.ui.graphics.ClipOp difference;
     enum_constant public static final androidx.ui.graphics.ClipOp intersect;
   }
@@ -231,7 +235,7 @@
     method public long getValue();
     method @androidx.compose.Immutable public static inline int hashCode-impl(long p);
     method public static String toString-impl(long $this);
-    field public static final androidx.ui.graphics.Color.Companion! Companion;
+    field public static final androidx.ui.graphics.Color.Companion Companion;
   }
 
   public static final class Color.Companion {
@@ -269,7 +273,7 @@
     method @androidx.compose.Immutable public androidx.ui.graphics.ColorFilter copy-vOa7YyA(long color, androidx.ui.graphics.BlendMode blendMode);
     method public androidx.ui.graphics.BlendMode getBlendMode();
     method public long getColor();
-    field public static final androidx.ui.graphics.ColorFilter.Companion! Companion;
+    field public static final androidx.ui.graphics.ColorFilter.Companion Companion;
   }
 
   public static final class ColorFilter.Companion {
@@ -291,6 +295,8 @@
   }
 
   public enum FilterQuality {
+    method public static androidx.ui.graphics.FilterQuality valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.FilterQuality[] values();
     enum_constant public static final androidx.ui.graphics.FilterQuality high;
     enum_constant public static final androidx.ui.graphics.FilterQuality low;
     enum_constant public static final androidx.ui.graphics.FilterQuality medium;
@@ -316,6 +322,8 @@
   }
 
   public enum ImageAssetConfig {
+    method public static androidx.ui.graphics.ImageAssetConfig valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.ImageAssetConfig[] values();
     enum_constant public static final androidx.ui.graphics.ImageAssetConfig Alpha8;
     enum_constant public static final androidx.ui.graphics.ImageAssetConfig Argb8888;
     enum_constant public static final androidx.ui.graphics.ImageAssetConfig F16;
@@ -409,6 +417,8 @@
   }
 
   public enum PaintingStyle {
+    method public static androidx.ui.graphics.PaintingStyle valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PaintingStyle[] values();
     enum_constant public static final androidx.ui.graphics.PaintingStyle fill;
     enum_constant public static final androidx.ui.graphics.PaintingStyle stroke;
   }
@@ -442,7 +452,7 @@
     property public abstract androidx.ui.graphics.PathFillType fillType;
     property public abstract boolean isConvex;
     property public abstract boolean isEmpty;
-    field public static final androidx.ui.graphics.Path.Companion! Companion;
+    field public static final androidx.ui.graphics.Path.Companion Companion;
   }
 
   public static final class Path.Companion {
@@ -450,11 +460,15 @@
   }
 
   public enum PathFillType {
+    method public static androidx.ui.graphics.PathFillType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PathFillType[] values();
     enum_constant public static final androidx.ui.graphics.PathFillType evenOdd;
     enum_constant public static final androidx.ui.graphics.PathFillType nonZero;
   }
 
   public enum PathOperation {
+    method public static androidx.ui.graphics.PathOperation valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PathOperation[] values();
     enum_constant public static final androidx.ui.graphics.PathOperation difference;
     enum_constant public static final androidx.ui.graphics.PathOperation intersect;
     enum_constant public static final androidx.ui.graphics.PathOperation reverseDifference;
@@ -473,6 +487,8 @@
   }
 
   public enum PointMode {
+    method public static androidx.ui.graphics.PointMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.PointMode[] values();
     enum_constant public static final androidx.ui.graphics.PointMode lines;
     enum_constant public static final androidx.ui.graphics.PointMode points;
     enum_constant public static final androidx.ui.graphics.PointMode polygon;
@@ -515,7 +531,7 @@
     method public float getBlurRadius();
     method public long getColor();
     method public androidx.ui.geometry.Offset getOffset();
-    field public static final androidx.ui.graphics.Shadow.Companion! Companion;
+    field public static final androidx.ui.graphics.Shadow.Companion Companion;
   }
 
   public static final class Shadow.Companion {
@@ -539,24 +555,32 @@
   }
 
   public enum StrokeCap {
+    method public static androidx.ui.graphics.StrokeCap valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.StrokeCap[] values();
     enum_constant public static final androidx.ui.graphics.StrokeCap butt;
     enum_constant public static final androidx.ui.graphics.StrokeCap round;
     enum_constant public static final androidx.ui.graphics.StrokeCap square;
   }
 
   public enum StrokeJoin {
+    method public static androidx.ui.graphics.StrokeJoin valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.StrokeJoin[] values();
     enum_constant public static final androidx.ui.graphics.StrokeJoin bevel;
     enum_constant public static final androidx.ui.graphics.StrokeJoin miter;
     enum_constant public static final androidx.ui.graphics.StrokeJoin round;
   }
 
   public enum TileMode {
+    method public static androidx.ui.graphics.TileMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.TileMode[] values();
     enum_constant public static final androidx.ui.graphics.TileMode Clamp;
     enum_constant public static final androidx.ui.graphics.TileMode Mirror;
     enum_constant public static final androidx.ui.graphics.TileMode Repeated;
   }
 
   public enum VertexMode {
+    method public static androidx.ui.graphics.VertexMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.VertexMode[] values();
     enum_constant public static final androidx.ui.graphics.VertexMode triangleFan;
     enum_constant public static final androidx.ui.graphics.VertexMode triangleStrip;
     enum_constant public static final androidx.ui.graphics.VertexMode triangles;
@@ -580,6 +604,8 @@
 package androidx.ui.graphics.colorspace {
 
   public enum Adaptation {
+    method public static androidx.ui.graphics.colorspace.Adaptation valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.colorspace.Adaptation[] values();
     enum_constant public static final androidx.ui.graphics.colorspace.Adaptation Bradford;
     enum_constant public static final androidx.ui.graphics.colorspace.Adaptation Ciecat02;
     enum_constant public static final androidx.ui.graphics.colorspace.Adaptation VonKries;
@@ -587,6 +613,8 @@
 
   public enum ColorModel {
     method public final int getComponentCount();
+    method public static androidx.ui.graphics.colorspace.ColorModel valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.colorspace.ColorModel[] values();
     enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Cmyk;
     enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Lab;
     enum_constant public static final androidx.ui.graphics.colorspace.ColorModel Rgb;
@@ -651,7 +679,7 @@
     property public final androidx.ui.graphics.colorspace.Rgb ProPhotoRgb;
     property public final androidx.ui.graphics.colorspace.Rgb SmpteC;
     property public final androidx.ui.graphics.colorspace.Rgb Srgb;
-    field public static final androidx.ui.graphics.colorspace.ColorSpaces! INSTANCE;
+    field public static final androidx.ui.graphics.colorspace.ColorSpaces INSTANCE;
   }
 
   public class Connector {
@@ -681,10 +709,12 @@
     property public final androidx.ui.graphics.colorspace.WhitePoint D65;
     property public final androidx.ui.graphics.colorspace.WhitePoint D75;
     property public final androidx.ui.graphics.colorspace.WhitePoint E;
-    field public static final androidx.ui.graphics.colorspace.Illuminant! INSTANCE;
+    field public static final androidx.ui.graphics.colorspace.Illuminant INSTANCE;
   }
 
   public enum RenderIntent {
+    method public static androidx.ui.graphics.colorspace.RenderIntent valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.colorspace.RenderIntent[] values();
     enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Absolute;
     enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Perceptual;
     enum_constant public static final androidx.ui.graphics.colorspace.RenderIntent Relative;
@@ -784,7 +814,7 @@
     property public final androidx.ui.geometry.Offset center;
     property public abstract androidx.ui.core.LayoutDirection layoutDirection;
     property public final androidx.ui.geometry.Size size;
-    field public static final androidx.ui.graphics.drawscope.DrawScope.Companion! Companion;
+    field public static final androidx.ui.graphics.drawscope.DrawScope.Companion Companion;
     field @kotlin.PublishedApi internal androidx.ui.graphics.Canvas canvas;
     field @kotlin.PublishedApi internal final androidx.ui.graphics.drawscope.DrawTransform transform;
   }
@@ -833,7 +863,7 @@
   }
 
   public final class Fill extends androidx.ui.graphics.drawscope.DrawStyle {
-    field public static final androidx.ui.graphics.drawscope.Fill! INSTANCE;
+    field public static final androidx.ui.graphics.drawscope.Fill INSTANCE;
   }
 
   public final class Stroke extends androidx.ui.graphics.drawscope.DrawStyle {
@@ -850,7 +880,7 @@
     method public float getMiter();
     method public android.graphics.PathEffect? getPathEffect();
     method public float getWidth();
-    field public static final androidx.ui.graphics.drawscope.Stroke.Companion! Companion;
+    field public static final androidx.ui.graphics.drawscope.Stroke.Companion Companion;
     field public static final float DefaultMiter = 4.0f;
     field public static final float HairlineWidth = 0.0f;
   }
@@ -947,7 +977,7 @@
   }
 
   public static final class PathNode.Close extends androidx.ui.graphics.vector.PathNode {
-    field public static final androidx.ui.graphics.vector.PathNode.Close! INSTANCE;
+    field public static final androidx.ui.graphics.vector.PathNode.Close INSTANCE;
   }
 
   public static final class PathNode.CurveTo extends androidx.ui.graphics.vector.PathNode {
@@ -1185,7 +1215,7 @@
     method public float[] toFloatArray();
     method public operator androidx.ui.graphics.vectormath.Matrix3 unaryMinus();
     property public final inline java.util.List<java.lang.Float> m3storage;
-    field public static final androidx.ui.graphics.vectormath.Matrix3.Companion! Companion;
+    field public static final androidx.ui.graphics.vectormath.Matrix3.Companion Companion;
   }
 
   public static final class Matrix3.Companion {
@@ -1265,7 +1295,7 @@
     property public final inline androidx.ui.graphics.vectormath.Vector3 translation;
     property public final inline androidx.ui.graphics.vectormath.Vector3 up;
     property public final inline androidx.ui.graphics.vectormath.Matrix3 upperLeft;
-    field public static final androidx.ui.graphics.vectormath.Matrix4.Companion! Companion;
+    field public static final androidx.ui.graphics.vectormath.Matrix4.Companion Companion;
   }
 
   public static final class Matrix4.Companion {
@@ -1292,6 +1322,8 @@
   }
 
   public enum MatrixColumn {
+    method public static androidx.ui.graphics.vectormath.MatrixColumn valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.vectormath.MatrixColumn[] values();
     enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn W;
     enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn X;
     enum_constant public static final androidx.ui.graphics.vectormath.MatrixColumn Y;
@@ -1580,6 +1612,8 @@
   }
 
   public enum VectorComponent {
+    method public static androidx.ui.graphics.vectormath.VectorComponent valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.graphics.vectormath.VectorComponent[] values();
     enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent A;
     enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent B;
     enum_constant public static final androidx.ui.graphics.vectormath.VectorComponent G;
diff --git a/ui/ui-layout/api/0.1.0-dev15.txt b/ui/ui-layout/api/0.1.0-dev15.txt
index d6dd40f..3b9fca9 100644
--- a/ui/ui-layout/api/0.1.0-dev15.txt
+++ b/ui/ui-layout/api/0.1.0-dev15.txt
@@ -8,22 +8,22 @@
 
   @androidx.compose.Immutable public interface Arrangement {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field @Deprecated public static final androidx.ui.layout.Arrangement.Companion! Companion;
+    field @Deprecated public static final androidx.ui.layout.Arrangement.Companion Companion;
   }
 
   public static final class Arrangement.Bottom implements androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Bottom! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Bottom INSTANCE;
   }
 
   public static final class Arrangement.Center implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Center! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Center INSTANCE;
   }
 
   public static final class Arrangement.End implements androidx.ui.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.End! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.End INSTANCE;
   }
 
   public static interface Arrangement.Horizontal extends androidx.ui.layout.Arrangement {
@@ -31,34 +31,34 @@
 
   public static final class Arrangement.SpaceAround implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.SpaceAround! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.SpaceAround INSTANCE;
   }
 
   public static final class Arrangement.SpaceBetween implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.SpaceBetween! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.SpaceBetween INSTANCE;
   }
 
   public static final class Arrangement.SpaceEvenly implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.SpaceEvenly! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.SpaceEvenly INSTANCE;
   }
 
   public static final class Arrangement.Start implements androidx.ui.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Start! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Start INSTANCE;
   }
 
   public static final class Arrangement.Top implements androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Top! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Top INSTANCE;
   }
 
   public static interface Arrangement.Vertical extends androidx.ui.layout.Arrangement {
   }
 
   public final class ChainStyle {
-    field public static final androidx.ui.layout.ChainStyle.Companion! Companion;
+    field public static final androidx.ui.layout.ChainStyle.Companion Companion;
   }
 
   public static final class ChainStyle.Companion {
@@ -80,7 +80,7 @@
     method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
     method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Horizontal align);
     method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
-    field public static final androidx.ui.layout.ColumnScope! INSTANCE;
+    field public static final androidx.ui.layout.ColumnScope INSTANCE;
   }
 
   @androidx.ui.layout.LayoutScopeMarker public final class ConstrainScope {
@@ -273,7 +273,7 @@
   }
 
   @Deprecated public static final class ConstraintSetBuilderScope.ChainStyle {
-    field @Deprecated public static final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle.Companion! Companion;
+    field @Deprecated public static final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle.Companion Companion;
   }
 
   @Deprecated public static final class ConstraintSetBuilderScope.ChainStyle.Companion {
@@ -419,7 +419,7 @@
   }
 
   @androidx.compose.Immutable public abstract sealed class CrossAxisAlignment {
-    field public static final androidx.ui.layout.CrossAxisAlignment.Companion! Companion;
+    field public static final androidx.ui.layout.CrossAxisAlignment.Companion Companion;
   }
 
   public static final class CrossAxisAlignment.Companion {
@@ -433,7 +433,7 @@
   }
 
   public interface Dimension {
-    field public static final androidx.ui.layout.Dimension.Companion! Companion;
+    field public static final androidx.ui.layout.Dimension.Companion Companion;
   }
 
   public static interface Dimension.Coercible extends androidx.ui.layout.Dimension {
@@ -467,7 +467,7 @@
     method public float getMaxWidth();
     method public float getMinHeight();
     method public float getMinWidth();
-    field public static final androidx.ui.layout.DpConstraints.Companion! Companion;
+    field public static final androidx.ui.layout.DpConstraints.Companion Companion;
   }
 
   public static final class DpConstraints.Companion {
@@ -493,6 +493,8 @@
   }
 
   public enum FlowCrossAxisAlignment {
+    method public static androidx.ui.layout.FlowCrossAxisAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.FlowCrossAxisAlignment[] values();
     enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Center;
     enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment End;
     enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Start;
@@ -525,6 +527,8 @@
   }
 
   public enum IntrinsicSize {
+    method public static androidx.ui.layout.IntrinsicSize valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.IntrinsicSize[] values();
     enum_constant public static final androidx.ui.layout.IntrinsicSize Max;
     enum_constant public static final androidx.ui.layout.IntrinsicSize Min;
   }
@@ -581,6 +585,8 @@
   }
 
   public enum MainAxisAlignment {
+    method public static androidx.ui.layout.MainAxisAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.MainAxisAlignment[] values();
     enum_constant public static final androidx.ui.layout.MainAxisAlignment Center;
     enum_constant public static final androidx.ui.layout.MainAxisAlignment End;
     enum_constant public static final androidx.ui.layout.MainAxisAlignment SpaceAround;
@@ -601,10 +607,12 @@
     method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
     method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Vertical align);
     method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
-    field public static final androidx.ui.layout.RowScope! INSTANCE;
+    field public static final androidx.ui.layout.RowScope INSTANCE;
   }
 
   public enum SizeMode {
+    method public static androidx.ui.layout.SizeMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.SizeMode[] values();
     enum_constant public static final androidx.ui.layout.SizeMode Expand;
     enum_constant public static final androidx.ui.layout.SizeMode Wrap;
   }
diff --git a/ui/ui-layout/api/current.txt b/ui/ui-layout/api/current.txt
index d6dd40f..3b9fca9 100644
--- a/ui/ui-layout/api/current.txt
+++ b/ui/ui-layout/api/current.txt
@@ -8,22 +8,22 @@
 
   @androidx.compose.Immutable public interface Arrangement {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field @Deprecated public static final androidx.ui.layout.Arrangement.Companion! Companion;
+    field @Deprecated public static final androidx.ui.layout.Arrangement.Companion Companion;
   }
 
   public static final class Arrangement.Bottom implements androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Bottom! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Bottom INSTANCE;
   }
 
   public static final class Arrangement.Center implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Center! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Center INSTANCE;
   }
 
   public static final class Arrangement.End implements androidx.ui.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.End! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.End INSTANCE;
   }
 
   public static interface Arrangement.Horizontal extends androidx.ui.layout.Arrangement {
@@ -31,34 +31,34 @@
 
   public static final class Arrangement.SpaceAround implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.SpaceAround! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.SpaceAround INSTANCE;
   }
 
   public static final class Arrangement.SpaceBetween implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.SpaceBetween! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.SpaceBetween INSTANCE;
   }
 
   public static final class Arrangement.SpaceEvenly implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.SpaceEvenly! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.SpaceEvenly INSTANCE;
   }
 
   public static final class Arrangement.Start implements androidx.ui.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Start! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Start INSTANCE;
   }
 
   public static final class Arrangement.Top implements androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Top! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Top INSTANCE;
   }
 
   public static interface Arrangement.Vertical extends androidx.ui.layout.Arrangement {
   }
 
   public final class ChainStyle {
-    field public static final androidx.ui.layout.ChainStyle.Companion! Companion;
+    field public static final androidx.ui.layout.ChainStyle.Companion Companion;
   }
 
   public static final class ChainStyle.Companion {
@@ -80,7 +80,7 @@
     method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
     method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Horizontal align);
     method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
-    field public static final androidx.ui.layout.ColumnScope! INSTANCE;
+    field public static final androidx.ui.layout.ColumnScope INSTANCE;
   }
 
   @androidx.ui.layout.LayoutScopeMarker public final class ConstrainScope {
@@ -273,7 +273,7 @@
   }
 
   @Deprecated public static final class ConstraintSetBuilderScope.ChainStyle {
-    field @Deprecated public static final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle.Companion! Companion;
+    field @Deprecated public static final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle.Companion Companion;
   }
 
   @Deprecated public static final class ConstraintSetBuilderScope.ChainStyle.Companion {
@@ -419,7 +419,7 @@
   }
 
   @androidx.compose.Immutable public abstract sealed class CrossAxisAlignment {
-    field public static final androidx.ui.layout.CrossAxisAlignment.Companion! Companion;
+    field public static final androidx.ui.layout.CrossAxisAlignment.Companion Companion;
   }
 
   public static final class CrossAxisAlignment.Companion {
@@ -433,7 +433,7 @@
   }
 
   public interface Dimension {
-    field public static final androidx.ui.layout.Dimension.Companion! Companion;
+    field public static final androidx.ui.layout.Dimension.Companion Companion;
   }
 
   public static interface Dimension.Coercible extends androidx.ui.layout.Dimension {
@@ -467,7 +467,7 @@
     method public float getMaxWidth();
     method public float getMinHeight();
     method public float getMinWidth();
-    field public static final androidx.ui.layout.DpConstraints.Companion! Companion;
+    field public static final androidx.ui.layout.DpConstraints.Companion Companion;
   }
 
   public static final class DpConstraints.Companion {
@@ -493,6 +493,8 @@
   }
 
   public enum FlowCrossAxisAlignment {
+    method public static androidx.ui.layout.FlowCrossAxisAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.FlowCrossAxisAlignment[] values();
     enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Center;
     enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment End;
     enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Start;
@@ -525,6 +527,8 @@
   }
 
   public enum IntrinsicSize {
+    method public static androidx.ui.layout.IntrinsicSize valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.IntrinsicSize[] values();
     enum_constant public static final androidx.ui.layout.IntrinsicSize Max;
     enum_constant public static final androidx.ui.layout.IntrinsicSize Min;
   }
@@ -581,6 +585,8 @@
   }
 
   public enum MainAxisAlignment {
+    method public static androidx.ui.layout.MainAxisAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.MainAxisAlignment[] values();
     enum_constant public static final androidx.ui.layout.MainAxisAlignment Center;
     enum_constant public static final androidx.ui.layout.MainAxisAlignment End;
     enum_constant public static final androidx.ui.layout.MainAxisAlignment SpaceAround;
@@ -601,10 +607,12 @@
     method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
     method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Vertical align);
     method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
-    field public static final androidx.ui.layout.RowScope! INSTANCE;
+    field public static final androidx.ui.layout.RowScope INSTANCE;
   }
 
   public enum SizeMode {
+    method public static androidx.ui.layout.SizeMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.SizeMode[] values();
     enum_constant public static final androidx.ui.layout.SizeMode Expand;
     enum_constant public static final androidx.ui.layout.SizeMode Wrap;
   }
diff --git a/ui/ui-layout/api/public_plus_experimental_0.1.0-dev15.txt b/ui/ui-layout/api/public_plus_experimental_0.1.0-dev15.txt
index d6dd40f..3b9fca9 100644
--- a/ui/ui-layout/api/public_plus_experimental_0.1.0-dev15.txt
+++ b/ui/ui-layout/api/public_plus_experimental_0.1.0-dev15.txt
@@ -8,22 +8,22 @@
 
   @androidx.compose.Immutable public interface Arrangement {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field @Deprecated public static final androidx.ui.layout.Arrangement.Companion! Companion;
+    field @Deprecated public static final androidx.ui.layout.Arrangement.Companion Companion;
   }
 
   public static final class Arrangement.Bottom implements androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Bottom! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Bottom INSTANCE;
   }
 
   public static final class Arrangement.Center implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Center! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Center INSTANCE;
   }
 
   public static final class Arrangement.End implements androidx.ui.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.End! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.End INSTANCE;
   }
 
   public static interface Arrangement.Horizontal extends androidx.ui.layout.Arrangement {
@@ -31,34 +31,34 @@
 
   public static final class Arrangement.SpaceAround implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.SpaceAround! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.SpaceAround INSTANCE;
   }
 
   public static final class Arrangement.SpaceBetween implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.SpaceBetween! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.SpaceBetween INSTANCE;
   }
 
   public static final class Arrangement.SpaceEvenly implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.SpaceEvenly! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.SpaceEvenly INSTANCE;
   }
 
   public static final class Arrangement.Start implements androidx.ui.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Start! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Start INSTANCE;
   }
 
   public static final class Arrangement.Top implements androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Top! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Top INSTANCE;
   }
 
   public static interface Arrangement.Vertical extends androidx.ui.layout.Arrangement {
   }
 
   public final class ChainStyle {
-    field public static final androidx.ui.layout.ChainStyle.Companion! Companion;
+    field public static final androidx.ui.layout.ChainStyle.Companion Companion;
   }
 
   public static final class ChainStyle.Companion {
@@ -80,7 +80,7 @@
     method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
     method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Horizontal align);
     method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
-    field public static final androidx.ui.layout.ColumnScope! INSTANCE;
+    field public static final androidx.ui.layout.ColumnScope INSTANCE;
   }
 
   @androidx.ui.layout.LayoutScopeMarker public final class ConstrainScope {
@@ -273,7 +273,7 @@
   }
 
   @Deprecated public static final class ConstraintSetBuilderScope.ChainStyle {
-    field @Deprecated public static final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle.Companion! Companion;
+    field @Deprecated public static final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle.Companion Companion;
   }
 
   @Deprecated public static final class ConstraintSetBuilderScope.ChainStyle.Companion {
@@ -419,7 +419,7 @@
   }
 
   @androidx.compose.Immutable public abstract sealed class CrossAxisAlignment {
-    field public static final androidx.ui.layout.CrossAxisAlignment.Companion! Companion;
+    field public static final androidx.ui.layout.CrossAxisAlignment.Companion Companion;
   }
 
   public static final class CrossAxisAlignment.Companion {
@@ -433,7 +433,7 @@
   }
 
   public interface Dimension {
-    field public static final androidx.ui.layout.Dimension.Companion! Companion;
+    field public static final androidx.ui.layout.Dimension.Companion Companion;
   }
 
   public static interface Dimension.Coercible extends androidx.ui.layout.Dimension {
@@ -467,7 +467,7 @@
     method public float getMaxWidth();
     method public float getMinHeight();
     method public float getMinWidth();
-    field public static final androidx.ui.layout.DpConstraints.Companion! Companion;
+    field public static final androidx.ui.layout.DpConstraints.Companion Companion;
   }
 
   public static final class DpConstraints.Companion {
@@ -493,6 +493,8 @@
   }
 
   public enum FlowCrossAxisAlignment {
+    method public static androidx.ui.layout.FlowCrossAxisAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.FlowCrossAxisAlignment[] values();
     enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Center;
     enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment End;
     enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Start;
@@ -525,6 +527,8 @@
   }
 
   public enum IntrinsicSize {
+    method public static androidx.ui.layout.IntrinsicSize valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.IntrinsicSize[] values();
     enum_constant public static final androidx.ui.layout.IntrinsicSize Max;
     enum_constant public static final androidx.ui.layout.IntrinsicSize Min;
   }
@@ -581,6 +585,8 @@
   }
 
   public enum MainAxisAlignment {
+    method public static androidx.ui.layout.MainAxisAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.MainAxisAlignment[] values();
     enum_constant public static final androidx.ui.layout.MainAxisAlignment Center;
     enum_constant public static final androidx.ui.layout.MainAxisAlignment End;
     enum_constant public static final androidx.ui.layout.MainAxisAlignment SpaceAround;
@@ -601,10 +607,12 @@
     method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
     method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Vertical align);
     method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
-    field public static final androidx.ui.layout.RowScope! INSTANCE;
+    field public static final androidx.ui.layout.RowScope INSTANCE;
   }
 
   public enum SizeMode {
+    method public static androidx.ui.layout.SizeMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.SizeMode[] values();
     enum_constant public static final androidx.ui.layout.SizeMode Expand;
     enum_constant public static final androidx.ui.layout.SizeMode Wrap;
   }
diff --git a/ui/ui-layout/api/public_plus_experimental_current.txt b/ui/ui-layout/api/public_plus_experimental_current.txt
index d6dd40f..3b9fca9 100644
--- a/ui/ui-layout/api/public_plus_experimental_current.txt
+++ b/ui/ui-layout/api/public_plus_experimental_current.txt
@@ -8,22 +8,22 @@
 
   @androidx.compose.Immutable public interface Arrangement {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field @Deprecated public static final androidx.ui.layout.Arrangement.Companion! Companion;
+    field @Deprecated public static final androidx.ui.layout.Arrangement.Companion Companion;
   }
 
   public static final class Arrangement.Bottom implements androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Bottom! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Bottom INSTANCE;
   }
 
   public static final class Arrangement.Center implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Center! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Center INSTANCE;
   }
 
   public static final class Arrangement.End implements androidx.ui.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.End! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.End INSTANCE;
   }
 
   public static interface Arrangement.Horizontal extends androidx.ui.layout.Arrangement {
@@ -31,34 +31,34 @@
 
   public static final class Arrangement.SpaceAround implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.SpaceAround! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.SpaceAround INSTANCE;
   }
 
   public static final class Arrangement.SpaceBetween implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.SpaceBetween! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.SpaceBetween INSTANCE;
   }
 
   public static final class Arrangement.SpaceEvenly implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.SpaceEvenly! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.SpaceEvenly INSTANCE;
   }
 
   public static final class Arrangement.Start implements androidx.ui.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Start! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Start INSTANCE;
   }
 
   public static final class Arrangement.Top implements androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Top! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Top INSTANCE;
   }
 
   public static interface Arrangement.Vertical extends androidx.ui.layout.Arrangement {
   }
 
   public final class ChainStyle {
-    field public static final androidx.ui.layout.ChainStyle.Companion! Companion;
+    field public static final androidx.ui.layout.ChainStyle.Companion Companion;
   }
 
   public static final class ChainStyle.Companion {
@@ -80,7 +80,7 @@
     method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
     method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Horizontal align);
     method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
-    field public static final androidx.ui.layout.ColumnScope! INSTANCE;
+    field public static final androidx.ui.layout.ColumnScope INSTANCE;
   }
 
   @androidx.ui.layout.LayoutScopeMarker public final class ConstrainScope {
@@ -273,7 +273,7 @@
   }
 
   @Deprecated public static final class ConstraintSetBuilderScope.ChainStyle {
-    field @Deprecated public static final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle.Companion! Companion;
+    field @Deprecated public static final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle.Companion Companion;
   }
 
   @Deprecated public static final class ConstraintSetBuilderScope.ChainStyle.Companion {
@@ -419,7 +419,7 @@
   }
 
   @androidx.compose.Immutable public abstract sealed class CrossAxisAlignment {
-    field public static final androidx.ui.layout.CrossAxisAlignment.Companion! Companion;
+    field public static final androidx.ui.layout.CrossAxisAlignment.Companion Companion;
   }
 
   public static final class CrossAxisAlignment.Companion {
@@ -433,7 +433,7 @@
   }
 
   public interface Dimension {
-    field public static final androidx.ui.layout.Dimension.Companion! Companion;
+    field public static final androidx.ui.layout.Dimension.Companion Companion;
   }
 
   public static interface Dimension.Coercible extends androidx.ui.layout.Dimension {
@@ -467,7 +467,7 @@
     method public float getMaxWidth();
     method public float getMinHeight();
     method public float getMinWidth();
-    field public static final androidx.ui.layout.DpConstraints.Companion! Companion;
+    field public static final androidx.ui.layout.DpConstraints.Companion Companion;
   }
 
   public static final class DpConstraints.Companion {
@@ -493,6 +493,8 @@
   }
 
   public enum FlowCrossAxisAlignment {
+    method public static androidx.ui.layout.FlowCrossAxisAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.FlowCrossAxisAlignment[] values();
     enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Center;
     enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment End;
     enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Start;
@@ -525,6 +527,8 @@
   }
 
   public enum IntrinsicSize {
+    method public static androidx.ui.layout.IntrinsicSize valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.IntrinsicSize[] values();
     enum_constant public static final androidx.ui.layout.IntrinsicSize Max;
     enum_constant public static final androidx.ui.layout.IntrinsicSize Min;
   }
@@ -581,6 +585,8 @@
   }
 
   public enum MainAxisAlignment {
+    method public static androidx.ui.layout.MainAxisAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.MainAxisAlignment[] values();
     enum_constant public static final androidx.ui.layout.MainAxisAlignment Center;
     enum_constant public static final androidx.ui.layout.MainAxisAlignment End;
     enum_constant public static final androidx.ui.layout.MainAxisAlignment SpaceAround;
@@ -601,10 +607,12 @@
     method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
     method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Vertical align);
     method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
-    field public static final androidx.ui.layout.RowScope! INSTANCE;
+    field public static final androidx.ui.layout.RowScope INSTANCE;
   }
 
   public enum SizeMode {
+    method public static androidx.ui.layout.SizeMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.SizeMode[] values();
     enum_constant public static final androidx.ui.layout.SizeMode Expand;
     enum_constant public static final androidx.ui.layout.SizeMode Wrap;
   }
diff --git a/ui/ui-layout/api/restricted_0.1.0-dev15.txt b/ui/ui-layout/api/restricted_0.1.0-dev15.txt
index d6dd40f..3b9fca9 100644
--- a/ui/ui-layout/api/restricted_0.1.0-dev15.txt
+++ b/ui/ui-layout/api/restricted_0.1.0-dev15.txt
@@ -8,22 +8,22 @@
 
   @androidx.compose.Immutable public interface Arrangement {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field @Deprecated public static final androidx.ui.layout.Arrangement.Companion! Companion;
+    field @Deprecated public static final androidx.ui.layout.Arrangement.Companion Companion;
   }
 
   public static final class Arrangement.Bottom implements androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Bottom! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Bottom INSTANCE;
   }
 
   public static final class Arrangement.Center implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Center! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Center INSTANCE;
   }
 
   public static final class Arrangement.End implements androidx.ui.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.End! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.End INSTANCE;
   }
 
   public static interface Arrangement.Horizontal extends androidx.ui.layout.Arrangement {
@@ -31,34 +31,34 @@
 
   public static final class Arrangement.SpaceAround implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.SpaceAround! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.SpaceAround INSTANCE;
   }
 
   public static final class Arrangement.SpaceBetween implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.SpaceBetween! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.SpaceBetween INSTANCE;
   }
 
   public static final class Arrangement.SpaceEvenly implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.SpaceEvenly! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.SpaceEvenly INSTANCE;
   }
 
   public static final class Arrangement.Start implements androidx.ui.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Start! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Start INSTANCE;
   }
 
   public static final class Arrangement.Top implements androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Top! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Top INSTANCE;
   }
 
   public static interface Arrangement.Vertical extends androidx.ui.layout.Arrangement {
   }
 
   public final class ChainStyle {
-    field public static final androidx.ui.layout.ChainStyle.Companion! Companion;
+    field public static final androidx.ui.layout.ChainStyle.Companion Companion;
   }
 
   public static final class ChainStyle.Companion {
@@ -80,7 +80,7 @@
     method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
     method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Horizontal align);
     method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
-    field public static final androidx.ui.layout.ColumnScope! INSTANCE;
+    field public static final androidx.ui.layout.ColumnScope INSTANCE;
   }
 
   @androidx.ui.layout.LayoutScopeMarker public final class ConstrainScope {
@@ -273,7 +273,7 @@
   }
 
   @Deprecated public static final class ConstraintSetBuilderScope.ChainStyle {
-    field @Deprecated public static final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle.Companion! Companion;
+    field @Deprecated public static final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle.Companion Companion;
   }
 
   @Deprecated public static final class ConstraintSetBuilderScope.ChainStyle.Companion {
@@ -419,7 +419,7 @@
   }
 
   @androidx.compose.Immutable public abstract sealed class CrossAxisAlignment {
-    field public static final androidx.ui.layout.CrossAxisAlignment.Companion! Companion;
+    field public static final androidx.ui.layout.CrossAxisAlignment.Companion Companion;
   }
 
   public static final class CrossAxisAlignment.Companion {
@@ -433,7 +433,7 @@
   }
 
   public interface Dimension {
-    field public static final androidx.ui.layout.Dimension.Companion! Companion;
+    field public static final androidx.ui.layout.Dimension.Companion Companion;
   }
 
   public static interface Dimension.Coercible extends androidx.ui.layout.Dimension {
@@ -467,7 +467,7 @@
     method public float getMaxWidth();
     method public float getMinHeight();
     method public float getMinWidth();
-    field public static final androidx.ui.layout.DpConstraints.Companion! Companion;
+    field public static final androidx.ui.layout.DpConstraints.Companion Companion;
   }
 
   public static final class DpConstraints.Companion {
@@ -493,6 +493,8 @@
   }
 
   public enum FlowCrossAxisAlignment {
+    method public static androidx.ui.layout.FlowCrossAxisAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.FlowCrossAxisAlignment[] values();
     enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Center;
     enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment End;
     enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Start;
@@ -525,6 +527,8 @@
   }
 
   public enum IntrinsicSize {
+    method public static androidx.ui.layout.IntrinsicSize valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.IntrinsicSize[] values();
     enum_constant public static final androidx.ui.layout.IntrinsicSize Max;
     enum_constant public static final androidx.ui.layout.IntrinsicSize Min;
   }
@@ -581,6 +585,8 @@
   }
 
   public enum MainAxisAlignment {
+    method public static androidx.ui.layout.MainAxisAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.MainAxisAlignment[] values();
     enum_constant public static final androidx.ui.layout.MainAxisAlignment Center;
     enum_constant public static final androidx.ui.layout.MainAxisAlignment End;
     enum_constant public static final androidx.ui.layout.MainAxisAlignment SpaceAround;
@@ -601,10 +607,12 @@
     method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
     method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Vertical align);
     method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
-    field public static final androidx.ui.layout.RowScope! INSTANCE;
+    field public static final androidx.ui.layout.RowScope INSTANCE;
   }
 
   public enum SizeMode {
+    method public static androidx.ui.layout.SizeMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.SizeMode[] values();
     enum_constant public static final androidx.ui.layout.SizeMode Expand;
     enum_constant public static final androidx.ui.layout.SizeMode Wrap;
   }
diff --git a/ui/ui-layout/api/restricted_current.txt b/ui/ui-layout/api/restricted_current.txt
index d6dd40f..3b9fca9 100644
--- a/ui/ui-layout/api/restricted_current.txt
+++ b/ui/ui-layout/api/restricted_current.txt
@@ -8,22 +8,22 @@
 
   @androidx.compose.Immutable public interface Arrangement {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field @Deprecated public static final androidx.ui.layout.Arrangement.Companion! Companion;
+    field @Deprecated public static final androidx.ui.layout.Arrangement.Companion Companion;
   }
 
   public static final class Arrangement.Bottom implements androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Bottom! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Bottom INSTANCE;
   }
 
   public static final class Arrangement.Center implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Center! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Center INSTANCE;
   }
 
   public static final class Arrangement.End implements androidx.ui.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.End! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.End INSTANCE;
   }
 
   public static interface Arrangement.Horizontal extends androidx.ui.layout.Arrangement {
@@ -31,34 +31,34 @@
 
   public static final class Arrangement.SpaceAround implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.SpaceAround! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.SpaceAround INSTANCE;
   }
 
   public static final class Arrangement.SpaceBetween implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.SpaceBetween! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.SpaceBetween INSTANCE;
   }
 
   public static final class Arrangement.SpaceEvenly implements androidx.ui.layout.Arrangement.Horizontal androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.SpaceEvenly! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.SpaceEvenly INSTANCE;
   }
 
   public static final class Arrangement.Start implements androidx.ui.layout.Arrangement.Horizontal {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Start! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Start INSTANCE;
   }
 
   public static final class Arrangement.Top implements androidx.ui.layout.Arrangement.Vertical {
     method public java.util.List<java.lang.Integer> arrange(int totalSize, java.util.List<java.lang.Integer> size, androidx.ui.core.LayoutDirection layoutDirection);
-    field public static final androidx.ui.layout.Arrangement.Top! INSTANCE;
+    field public static final androidx.ui.layout.Arrangement.Top INSTANCE;
   }
 
   public static interface Arrangement.Vertical extends androidx.ui.layout.Arrangement {
   }
 
   public final class ChainStyle {
-    field public static final androidx.ui.layout.ChainStyle.Companion! Companion;
+    field public static final androidx.ui.layout.ChainStyle.Companion Companion;
   }
 
   public static final class ChainStyle.Companion {
@@ -80,7 +80,7 @@
     method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
     method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Horizontal align);
     method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
-    field public static final androidx.ui.layout.ColumnScope! INSTANCE;
+    field public static final androidx.ui.layout.ColumnScope INSTANCE;
   }
 
   @androidx.ui.layout.LayoutScopeMarker public final class ConstrainScope {
@@ -273,7 +273,7 @@
   }
 
   @Deprecated public static final class ConstraintSetBuilderScope.ChainStyle {
-    field @Deprecated public static final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle.Companion! Companion;
+    field @Deprecated public static final androidx.ui.layout.ConstraintSetBuilderScope.ChainStyle.Companion Companion;
   }
 
   @Deprecated public static final class ConstraintSetBuilderScope.ChainStyle.Companion {
@@ -419,7 +419,7 @@
   }
 
   @androidx.compose.Immutable public abstract sealed class CrossAxisAlignment {
-    field public static final androidx.ui.layout.CrossAxisAlignment.Companion! Companion;
+    field public static final androidx.ui.layout.CrossAxisAlignment.Companion Companion;
   }
 
   public static final class CrossAxisAlignment.Companion {
@@ -433,7 +433,7 @@
   }
 
   public interface Dimension {
-    field public static final androidx.ui.layout.Dimension.Companion! Companion;
+    field public static final androidx.ui.layout.Dimension.Companion Companion;
   }
 
   public static interface Dimension.Coercible extends androidx.ui.layout.Dimension {
@@ -467,7 +467,7 @@
     method public float getMaxWidth();
     method public float getMinHeight();
     method public float getMinWidth();
-    field public static final androidx.ui.layout.DpConstraints.Companion! Companion;
+    field public static final androidx.ui.layout.DpConstraints.Companion Companion;
   }
 
   public static final class DpConstraints.Companion {
@@ -493,6 +493,8 @@
   }
 
   public enum FlowCrossAxisAlignment {
+    method public static androidx.ui.layout.FlowCrossAxisAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.FlowCrossAxisAlignment[] values();
     enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Center;
     enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment End;
     enum_constant public static final androidx.ui.layout.FlowCrossAxisAlignment Start;
@@ -525,6 +527,8 @@
   }
 
   public enum IntrinsicSize {
+    method public static androidx.ui.layout.IntrinsicSize valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.IntrinsicSize[] values();
     enum_constant public static final androidx.ui.layout.IntrinsicSize Max;
     enum_constant public static final androidx.ui.layout.IntrinsicSize Min;
   }
@@ -581,6 +585,8 @@
   }
 
   public enum MainAxisAlignment {
+    method public static androidx.ui.layout.MainAxisAlignment valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.MainAxisAlignment[] values();
     enum_constant public static final androidx.ui.layout.MainAxisAlignment Center;
     enum_constant public static final androidx.ui.layout.MainAxisAlignment End;
     enum_constant public static final androidx.ui.layout.MainAxisAlignment SpaceAround;
@@ -601,10 +607,12 @@
     method @androidx.compose.Stable public androidx.ui.core.Modifier alignWithSiblings(androidx.ui.core.Modifier, kotlin.jvm.functions.Function1<? super androidx.ui.core.Measured,java.lang.Integer> alignmentLineBlock);
     method @androidx.compose.Stable public androidx.ui.core.Modifier gravity(androidx.ui.core.Modifier, androidx.ui.core.Alignment.Vertical align);
     method @androidx.compose.Stable public androidx.ui.core.Modifier weight(androidx.ui.core.Modifier, @FloatRange(from=0.0, fromInclusive=false) float weight, boolean fill = true);
-    field public static final androidx.ui.layout.RowScope! INSTANCE;
+    field public static final androidx.ui.layout.RowScope INSTANCE;
   }
 
   public enum SizeMode {
+    method public static androidx.ui.layout.SizeMode valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.layout.SizeMode[] values();
     enum_constant public static final androidx.ui.layout.SizeMode Expand;
     enum_constant public static final androidx.ui.layout.SizeMode Wrap;
   }
diff --git a/ui/ui-material/api/0.1.0-dev15.txt b/ui/ui-material/api/0.1.0-dev15.txt
index e436065..dd6ea59 100644
--- a/ui/ui-material/api/0.1.0-dev15.txt
+++ b/ui/ui-material/api/0.1.0-dev15.txt
@@ -2,6 +2,8 @@
 package androidx.ui.material {
 
   public enum AlertDialogButtonLayout {
+    method public static androidx.ui.material.AlertDialogButtonLayout valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.material.AlertDialogButtonLayout[] values();
     enum_constant public static final androidx.ui.material.AlertDialogButtonLayout SideBySide;
     enum_constant public static final androidx.ui.material.AlertDialogButtonLayout Stacked;
   }
@@ -33,7 +35,7 @@
     property public final float DefaultMinWidth;
     property public final long defaultDisabledBackgroundColor;
     property public final long defaultDisabledContentColor;
-    field public static final androidx.ui.material.Button! INSTANCE;
+    field public static final androidx.ui.material.Button INSTANCE;
   }
 
   public final class ButtonKt {
@@ -94,7 +96,7 @@
   public final class DrawerConstants {
     method public float getDefaultElevation();
     property public final float DefaultElevation;
-    field public static final androidx.ui.material.DrawerConstants! INSTANCE;
+    field public static final androidx.ui.material.DrawerConstants INSTANCE;
   }
 
   public final class DrawerKt {
@@ -103,6 +105,8 @@
   }
 
   public enum DrawerState {
+    method public static androidx.ui.material.DrawerState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.material.DrawerState[] values();
     enum_constant public static final androidx.ui.material.DrawerState Closed;
     enum_constant public static final androidx.ui.material.DrawerState Opened;
   }
@@ -147,7 +151,7 @@
     property public final androidx.ui.material.ColorPalette colors;
     property public final androidx.ui.material.Shapes shapes;
     property public final androidx.ui.material.Typography typography;
-    field public static final androidx.ui.material.MaterialTheme! INSTANCE;
+    field public static final androidx.ui.material.MaterialTheme INSTANCE;
   }
 
   public final class MaterialThemeKt {
@@ -162,7 +166,7 @@
   public final class ProgressIndicatorConstants {
     method public float getDefaultStrokeWidth();
     property public final float DefaultStrokeWidth;
-    field public static final androidx.ui.material.ProgressIndicatorConstants! INSTANCE;
+    field public static final androidx.ui.material.ProgressIndicatorConstants INSTANCE;
   }
 
   public final class ProgressIndicatorKt {
@@ -177,7 +181,7 @@
     method public long getDefaultUnselectedColor();
     property public final long defaultDisabledColor;
     property public final long defaultUnselectedColor;
-    field public static final androidx.ui.material.RadioButtonConstants! INSTANCE;
+    field public static final androidx.ui.material.RadioButtonConstants INSTANCE;
   }
 
   public final class RadioButtonKt {
@@ -192,10 +196,12 @@
   }
 
   public final class Scaffold {
-    field public static final androidx.ui.material.Scaffold! INSTANCE;
+    field public static final androidx.ui.material.Scaffold INSTANCE;
   }
 
   public enum Scaffold.FabPosition {
+    method public static androidx.ui.material.Scaffold.FabPosition valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.material.Scaffold.FabPosition[] values();
     enum_constant public static final androidx.ui.material.Scaffold.FabPosition Center;
     enum_constant public static final androidx.ui.material.Scaffold.FabPosition End;
   }
@@ -267,7 +273,7 @@
   public final class TabRow {
     method @androidx.compose.Composable public void Indicator-e8O-MNM(androidx.ui.core.Modifier modifier = Modifier, long color = contentColor());
     method @androidx.compose.Composable public void IndicatorContainer(java.util.List<androidx.ui.material.TabRow.TabPosition> tabPositions, int selectedIndex, kotlin.jvm.functions.Function0<kotlin.Unit> indicator);
-    field public static final androidx.ui.material.TabRow! INSTANCE;
+    field public static final androidx.ui.material.TabRow INSTANCE;
   }
 
   @androidx.compose.Immutable public static final class TabRow.TabPosition {
@@ -283,7 +289,7 @@
   public final class TextButton {
     method public androidx.ui.layout.InnerPadding getDefaultInnerPadding();
     property public final androidx.ui.layout.InnerPadding DefaultInnerPadding;
-    field public static final androidx.ui.material.TextButton! INSTANCE;
+    field public static final androidx.ui.material.TextButton INSTANCE;
   }
 
   public final class TextFieldKt {
diff --git a/ui/ui-material/api/api_lint.ignore b/ui/ui-material/api/api_lint.ignore
deleted file mode 100644
index 7e1573a..0000000
--- a/ui/ui-material/api/api_lint.ignore
+++ /dev/null
@@ -1,3 +0,0 @@
-// Baseline format: 1.0
-NotCloseable: androidx.ui.material.ripple.RippleEffect:
-    Classes that release resources (finish()) should implement AutoClosable and CloseGuard: class androidx.ui.material.ripple.RippleEffect
diff --git a/ui/ui-material/api/current.txt b/ui/ui-material/api/current.txt
index e436065..dd6ea59 100644
--- a/ui/ui-material/api/current.txt
+++ b/ui/ui-material/api/current.txt
@@ -2,6 +2,8 @@
 package androidx.ui.material {
 
   public enum AlertDialogButtonLayout {
+    method public static androidx.ui.material.AlertDialogButtonLayout valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.material.AlertDialogButtonLayout[] values();
     enum_constant public static final androidx.ui.material.AlertDialogButtonLayout SideBySide;
     enum_constant public static final androidx.ui.material.AlertDialogButtonLayout Stacked;
   }
@@ -33,7 +35,7 @@
     property public final float DefaultMinWidth;
     property public final long defaultDisabledBackgroundColor;
     property public final long defaultDisabledContentColor;
-    field public static final androidx.ui.material.Button! INSTANCE;
+    field public static final androidx.ui.material.Button INSTANCE;
   }
 
   public final class ButtonKt {
@@ -94,7 +96,7 @@
   public final class DrawerConstants {
     method public float getDefaultElevation();
     property public final float DefaultElevation;
-    field public static final androidx.ui.material.DrawerConstants! INSTANCE;
+    field public static final androidx.ui.material.DrawerConstants INSTANCE;
   }
 
   public final class DrawerKt {
@@ -103,6 +105,8 @@
   }
 
   public enum DrawerState {
+    method public static androidx.ui.material.DrawerState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.material.DrawerState[] values();
     enum_constant public static final androidx.ui.material.DrawerState Closed;
     enum_constant public static final androidx.ui.material.DrawerState Opened;
   }
@@ -147,7 +151,7 @@
     property public final androidx.ui.material.ColorPalette colors;
     property public final androidx.ui.material.Shapes shapes;
     property public final androidx.ui.material.Typography typography;
-    field public static final androidx.ui.material.MaterialTheme! INSTANCE;
+    field public static final androidx.ui.material.MaterialTheme INSTANCE;
   }
 
   public final class MaterialThemeKt {
@@ -162,7 +166,7 @@
   public final class ProgressIndicatorConstants {
     method public float getDefaultStrokeWidth();
     property public final float DefaultStrokeWidth;
-    field public static final androidx.ui.material.ProgressIndicatorConstants! INSTANCE;
+    field public static final androidx.ui.material.ProgressIndicatorConstants INSTANCE;
   }
 
   public final class ProgressIndicatorKt {
@@ -177,7 +181,7 @@
     method public long getDefaultUnselectedColor();
     property public final long defaultDisabledColor;
     property public final long defaultUnselectedColor;
-    field public static final androidx.ui.material.RadioButtonConstants! INSTANCE;
+    field public static final androidx.ui.material.RadioButtonConstants INSTANCE;
   }
 
   public final class RadioButtonKt {
@@ -192,10 +196,12 @@
   }
 
   public final class Scaffold {
-    field public static final androidx.ui.material.Scaffold! INSTANCE;
+    field public static final androidx.ui.material.Scaffold INSTANCE;
   }
 
   public enum Scaffold.FabPosition {
+    method public static androidx.ui.material.Scaffold.FabPosition valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.material.Scaffold.FabPosition[] values();
     enum_constant public static final androidx.ui.material.Scaffold.FabPosition Center;
     enum_constant public static final androidx.ui.material.Scaffold.FabPosition End;
   }
@@ -267,7 +273,7 @@
   public final class TabRow {
     method @androidx.compose.Composable public void Indicator-e8O-MNM(androidx.ui.core.Modifier modifier = Modifier, long color = contentColor());
     method @androidx.compose.Composable public void IndicatorContainer(java.util.List<androidx.ui.material.TabRow.TabPosition> tabPositions, int selectedIndex, kotlin.jvm.functions.Function0<kotlin.Unit> indicator);
-    field public static final androidx.ui.material.TabRow! INSTANCE;
+    field public static final androidx.ui.material.TabRow INSTANCE;
   }
 
   @androidx.compose.Immutable public static final class TabRow.TabPosition {
@@ -283,7 +289,7 @@
   public final class TextButton {
     method public androidx.ui.layout.InnerPadding getDefaultInnerPadding();
     property public final androidx.ui.layout.InnerPadding DefaultInnerPadding;
-    field public static final androidx.ui.material.TextButton! INSTANCE;
+    field public static final androidx.ui.material.TextButton INSTANCE;
   }
 
   public final class TextFieldKt {
diff --git a/ui/ui-material/api/public_plus_experimental_0.1.0-dev15.txt b/ui/ui-material/api/public_plus_experimental_0.1.0-dev15.txt
index e436065..dd6ea59 100644
--- a/ui/ui-material/api/public_plus_experimental_0.1.0-dev15.txt
+++ b/ui/ui-material/api/public_plus_experimental_0.1.0-dev15.txt
@@ -2,6 +2,8 @@
 package androidx.ui.material {
 
   public enum AlertDialogButtonLayout {
+    method public static androidx.ui.material.AlertDialogButtonLayout valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.material.AlertDialogButtonLayout[] values();
     enum_constant public static final androidx.ui.material.AlertDialogButtonLayout SideBySide;
     enum_constant public static final androidx.ui.material.AlertDialogButtonLayout Stacked;
   }
@@ -33,7 +35,7 @@
     property public final float DefaultMinWidth;
     property public final long defaultDisabledBackgroundColor;
     property public final long defaultDisabledContentColor;
-    field public static final androidx.ui.material.Button! INSTANCE;
+    field public static final androidx.ui.material.Button INSTANCE;
   }
 
   public final class ButtonKt {
@@ -94,7 +96,7 @@
   public final class DrawerConstants {
     method public float getDefaultElevation();
     property public final float DefaultElevation;
-    field public static final androidx.ui.material.DrawerConstants! INSTANCE;
+    field public static final androidx.ui.material.DrawerConstants INSTANCE;
   }
 
   public final class DrawerKt {
@@ -103,6 +105,8 @@
   }
 
   public enum DrawerState {
+    method public static androidx.ui.material.DrawerState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.material.DrawerState[] values();
     enum_constant public static final androidx.ui.material.DrawerState Closed;
     enum_constant public static final androidx.ui.material.DrawerState Opened;
   }
@@ -147,7 +151,7 @@
     property public final androidx.ui.material.ColorPalette colors;
     property public final androidx.ui.material.Shapes shapes;
     property public final androidx.ui.material.Typography typography;
-    field public static final androidx.ui.material.MaterialTheme! INSTANCE;
+    field public static final androidx.ui.material.MaterialTheme INSTANCE;
   }
 
   public final class MaterialThemeKt {
@@ -162,7 +166,7 @@
   public final class ProgressIndicatorConstants {
     method public float getDefaultStrokeWidth();
     property public final float DefaultStrokeWidth;
-    field public static final androidx.ui.material.ProgressIndicatorConstants! INSTANCE;
+    field public static final androidx.ui.material.ProgressIndicatorConstants INSTANCE;
   }
 
   public final class ProgressIndicatorKt {
@@ -177,7 +181,7 @@
     method public long getDefaultUnselectedColor();
     property public final long defaultDisabledColor;
     property public final long defaultUnselectedColor;
-    field public static final androidx.ui.material.RadioButtonConstants! INSTANCE;
+    field public static final androidx.ui.material.RadioButtonConstants INSTANCE;
   }
 
   public final class RadioButtonKt {
@@ -192,10 +196,12 @@
   }
 
   public final class Scaffold {
-    field public static final androidx.ui.material.Scaffold! INSTANCE;
+    field public static final androidx.ui.material.Scaffold INSTANCE;
   }
 
   public enum Scaffold.FabPosition {
+    method public static androidx.ui.material.Scaffold.FabPosition valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.material.Scaffold.FabPosition[] values();
     enum_constant public static final androidx.ui.material.Scaffold.FabPosition Center;
     enum_constant public static final androidx.ui.material.Scaffold.FabPosition End;
   }
@@ -267,7 +273,7 @@
   public final class TabRow {
     method @androidx.compose.Composable public void Indicator-e8O-MNM(androidx.ui.core.Modifier modifier = Modifier, long color = contentColor());
     method @androidx.compose.Composable public void IndicatorContainer(java.util.List<androidx.ui.material.TabRow.TabPosition> tabPositions, int selectedIndex, kotlin.jvm.functions.Function0<kotlin.Unit> indicator);
-    field public static final androidx.ui.material.TabRow! INSTANCE;
+    field public static final androidx.ui.material.TabRow INSTANCE;
   }
 
   @androidx.compose.Immutable public static final class TabRow.TabPosition {
@@ -283,7 +289,7 @@
   public final class TextButton {
     method public androidx.ui.layout.InnerPadding getDefaultInnerPadding();
     property public final androidx.ui.layout.InnerPadding DefaultInnerPadding;
-    field public static final androidx.ui.material.TextButton! INSTANCE;
+    field public static final androidx.ui.material.TextButton INSTANCE;
   }
 
   public final class TextFieldKt {
diff --git a/ui/ui-material/api/public_plus_experimental_current.txt b/ui/ui-material/api/public_plus_experimental_current.txt
index e436065..dd6ea59 100644
--- a/ui/ui-material/api/public_plus_experimental_current.txt
+++ b/ui/ui-material/api/public_plus_experimental_current.txt
@@ -2,6 +2,8 @@
 package androidx.ui.material {
 
   public enum AlertDialogButtonLayout {
+    method public static androidx.ui.material.AlertDialogButtonLayout valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.material.AlertDialogButtonLayout[] values();
     enum_constant public static final androidx.ui.material.AlertDialogButtonLayout SideBySide;
     enum_constant public static final androidx.ui.material.AlertDialogButtonLayout Stacked;
   }
@@ -33,7 +35,7 @@
     property public final float DefaultMinWidth;
     property public final long defaultDisabledBackgroundColor;
     property public final long defaultDisabledContentColor;
-    field public static final androidx.ui.material.Button! INSTANCE;
+    field public static final androidx.ui.material.Button INSTANCE;
   }
 
   public final class ButtonKt {
@@ -94,7 +96,7 @@
   public final class DrawerConstants {
     method public float getDefaultElevation();
     property public final float DefaultElevation;
-    field public static final androidx.ui.material.DrawerConstants! INSTANCE;
+    field public static final androidx.ui.material.DrawerConstants INSTANCE;
   }
 
   public final class DrawerKt {
@@ -103,6 +105,8 @@
   }
 
   public enum DrawerState {
+    method public static androidx.ui.material.DrawerState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.material.DrawerState[] values();
     enum_constant public static final androidx.ui.material.DrawerState Closed;
     enum_constant public static final androidx.ui.material.DrawerState Opened;
   }
@@ -147,7 +151,7 @@
     property public final androidx.ui.material.ColorPalette colors;
     property public final androidx.ui.material.Shapes shapes;
     property public final androidx.ui.material.Typography typography;
-    field public static final androidx.ui.material.MaterialTheme! INSTANCE;
+    field public static final androidx.ui.material.MaterialTheme INSTANCE;
   }
 
   public final class MaterialThemeKt {
@@ -162,7 +166,7 @@
   public final class ProgressIndicatorConstants {
     method public float getDefaultStrokeWidth();
     property public final float DefaultStrokeWidth;
-    field public static final androidx.ui.material.ProgressIndicatorConstants! INSTANCE;
+    field public static final androidx.ui.material.ProgressIndicatorConstants INSTANCE;
   }
 
   public final class ProgressIndicatorKt {
@@ -177,7 +181,7 @@
     method public long getDefaultUnselectedColor();
     property public final long defaultDisabledColor;
     property public final long defaultUnselectedColor;
-    field public static final androidx.ui.material.RadioButtonConstants! INSTANCE;
+    field public static final androidx.ui.material.RadioButtonConstants INSTANCE;
   }
 
   public final class RadioButtonKt {
@@ -192,10 +196,12 @@
   }
 
   public final class Scaffold {
-    field public static final androidx.ui.material.Scaffold! INSTANCE;
+    field public static final androidx.ui.material.Scaffold INSTANCE;
   }
 
   public enum Scaffold.FabPosition {
+    method public static androidx.ui.material.Scaffold.FabPosition valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.material.Scaffold.FabPosition[] values();
     enum_constant public static final androidx.ui.material.Scaffold.FabPosition Center;
     enum_constant public static final androidx.ui.material.Scaffold.FabPosition End;
   }
@@ -267,7 +273,7 @@
   public final class TabRow {
     method @androidx.compose.Composable public void Indicator-e8O-MNM(androidx.ui.core.Modifier modifier = Modifier, long color = contentColor());
     method @androidx.compose.Composable public void IndicatorContainer(java.util.List<androidx.ui.material.TabRow.TabPosition> tabPositions, int selectedIndex, kotlin.jvm.functions.Function0<kotlin.Unit> indicator);
-    field public static final androidx.ui.material.TabRow! INSTANCE;
+    field public static final androidx.ui.material.TabRow INSTANCE;
   }
 
   @androidx.compose.Immutable public static final class TabRow.TabPosition {
@@ -283,7 +289,7 @@
   public final class TextButton {
     method public androidx.ui.layout.InnerPadding getDefaultInnerPadding();
     property public final androidx.ui.layout.InnerPadding DefaultInnerPadding;
-    field public static final androidx.ui.material.TextButton! INSTANCE;
+    field public static final androidx.ui.material.TextButton INSTANCE;
   }
 
   public final class TextFieldKt {
diff --git a/ui/ui-material/api/restricted_0.1.0-dev15.txt b/ui/ui-material/api/restricted_0.1.0-dev15.txt
index 392ee62..798e755 100644
--- a/ui/ui-material/api/restricted_0.1.0-dev15.txt
+++ b/ui/ui-material/api/restricted_0.1.0-dev15.txt
@@ -2,6 +2,8 @@
 package androidx.ui.material {
 
   public enum AlertDialogButtonLayout {
+    method public static androidx.ui.material.AlertDialogButtonLayout valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.material.AlertDialogButtonLayout[] values();
     enum_constant public static final androidx.ui.material.AlertDialogButtonLayout SideBySide;
     enum_constant public static final androidx.ui.material.AlertDialogButtonLayout Stacked;
   }
@@ -33,7 +35,7 @@
     property public final float DefaultMinWidth;
     property public final long defaultDisabledBackgroundColor;
     property public final long defaultDisabledContentColor;
-    field public static final androidx.ui.material.Button! INSTANCE;
+    field public static final androidx.ui.material.Button INSTANCE;
   }
 
   public final class ButtonKt {
@@ -95,7 +97,7 @@
   public final class DrawerConstants {
     method public float getDefaultElevation();
     property public final float DefaultElevation;
-    field public static final androidx.ui.material.DrawerConstants! INSTANCE;
+    field public static final androidx.ui.material.DrawerConstants INSTANCE;
   }
 
   public final class DrawerKt {
@@ -104,6 +106,8 @@
   }
 
   public enum DrawerState {
+    method public static androidx.ui.material.DrawerState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.material.DrawerState[] values();
     enum_constant public static final androidx.ui.material.DrawerState Closed;
     enum_constant public static final androidx.ui.material.DrawerState Opened;
   }
@@ -148,7 +152,7 @@
     property public final androidx.ui.material.ColorPalette colors;
     property public final androidx.ui.material.Shapes shapes;
     property public final androidx.ui.material.Typography typography;
-    field public static final androidx.ui.material.MaterialTheme! INSTANCE;
+    field public static final androidx.ui.material.MaterialTheme INSTANCE;
   }
 
   public final class MaterialThemeKt {
@@ -163,7 +167,7 @@
   public final class ProgressIndicatorConstants {
     method public float getDefaultStrokeWidth();
     property public final float DefaultStrokeWidth;
-    field public static final androidx.ui.material.ProgressIndicatorConstants! INSTANCE;
+    field public static final androidx.ui.material.ProgressIndicatorConstants INSTANCE;
   }
 
   public final class ProgressIndicatorKt {
@@ -178,7 +182,7 @@
     method public long getDefaultUnselectedColor();
     property public final long defaultDisabledColor;
     property public final long defaultUnselectedColor;
-    field public static final androidx.ui.material.RadioButtonConstants! INSTANCE;
+    field public static final androidx.ui.material.RadioButtonConstants INSTANCE;
   }
 
   public final class RadioButtonKt {
@@ -193,10 +197,12 @@
   }
 
   public final class Scaffold {
-    field public static final androidx.ui.material.Scaffold! INSTANCE;
+    field public static final androidx.ui.material.Scaffold INSTANCE;
   }
 
   public enum Scaffold.FabPosition {
+    method public static androidx.ui.material.Scaffold.FabPosition valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.material.Scaffold.FabPosition[] values();
     enum_constant public static final androidx.ui.material.Scaffold.FabPosition Center;
     enum_constant public static final androidx.ui.material.Scaffold.FabPosition End;
   }
@@ -268,7 +274,7 @@
   public final class TabRow {
     method @androidx.compose.Composable public void Indicator-e8O-MNM(androidx.ui.core.Modifier modifier = Modifier, long color = contentColor());
     method @androidx.compose.Composable public void IndicatorContainer(java.util.List<androidx.ui.material.TabRow.TabPosition> tabPositions, int selectedIndex, kotlin.jvm.functions.Function0<kotlin.Unit> indicator);
-    field public static final androidx.ui.material.TabRow! INSTANCE;
+    field public static final androidx.ui.material.TabRow INSTANCE;
   }
 
   @androidx.compose.Immutable public static final class TabRow.TabPosition {
@@ -284,7 +290,7 @@
   public final class TextButton {
     method public androidx.ui.layout.InnerPadding getDefaultInnerPadding();
     property public final androidx.ui.layout.InnerPadding DefaultInnerPadding;
-    field public static final androidx.ui.material.TextButton! INSTANCE;
+    field public static final androidx.ui.material.TextButton INSTANCE;
   }
 
   public final class TextFieldKt {
diff --git a/ui/ui-material/api/restricted_current.txt b/ui/ui-material/api/restricted_current.txt
index 392ee62..798e755 100644
--- a/ui/ui-material/api/restricted_current.txt
+++ b/ui/ui-material/api/restricted_current.txt
@@ -2,6 +2,8 @@
 package androidx.ui.material {
 
   public enum AlertDialogButtonLayout {
+    method public static androidx.ui.material.AlertDialogButtonLayout valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.material.AlertDialogButtonLayout[] values();
     enum_constant public static final androidx.ui.material.AlertDialogButtonLayout SideBySide;
     enum_constant public static final androidx.ui.material.AlertDialogButtonLayout Stacked;
   }
@@ -33,7 +35,7 @@
     property public final float DefaultMinWidth;
     property public final long defaultDisabledBackgroundColor;
     property public final long defaultDisabledContentColor;
-    field public static final androidx.ui.material.Button! INSTANCE;
+    field public static final androidx.ui.material.Button INSTANCE;
   }
 
   public final class ButtonKt {
@@ -95,7 +97,7 @@
   public final class DrawerConstants {
     method public float getDefaultElevation();
     property public final float DefaultElevation;
-    field public static final androidx.ui.material.DrawerConstants! INSTANCE;
+    field public static final androidx.ui.material.DrawerConstants INSTANCE;
   }
 
   public final class DrawerKt {
@@ -104,6 +106,8 @@
   }
 
   public enum DrawerState {
+    method public static androidx.ui.material.DrawerState valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.material.DrawerState[] values();
     enum_constant public static final androidx.ui.material.DrawerState Closed;
     enum_constant public static final androidx.ui.material.DrawerState Opened;
   }
@@ -148,7 +152,7 @@
     property public final androidx.ui.material.ColorPalette colors;
     property public final androidx.ui.material.Shapes shapes;
     property public final androidx.ui.material.Typography typography;
-    field public static final androidx.ui.material.MaterialTheme! INSTANCE;
+    field public static final androidx.ui.material.MaterialTheme INSTANCE;
   }
 
   public final class MaterialThemeKt {
@@ -163,7 +167,7 @@
   public final class ProgressIndicatorConstants {
     method public float getDefaultStrokeWidth();
     property public final float DefaultStrokeWidth;
-    field public static final androidx.ui.material.ProgressIndicatorConstants! INSTANCE;
+    field public static final androidx.ui.material.ProgressIndicatorConstants INSTANCE;
   }
 
   public final class ProgressIndicatorKt {
@@ -178,7 +182,7 @@
     method public long getDefaultUnselectedColor();
     property public final long defaultDisabledColor;
     property public final long defaultUnselectedColor;
-    field public static final androidx.ui.material.RadioButtonConstants! INSTANCE;
+    field public static final androidx.ui.material.RadioButtonConstants INSTANCE;
   }
 
   public final class RadioButtonKt {
@@ -193,10 +197,12 @@
   }
 
   public final class Scaffold {
-    field public static final androidx.ui.material.Scaffold! INSTANCE;
+    field public static final androidx.ui.material.Scaffold INSTANCE;
   }
 
   public enum Scaffold.FabPosition {
+    method public static androidx.ui.material.Scaffold.FabPosition valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.material.Scaffold.FabPosition[] values();
     enum_constant public static final androidx.ui.material.Scaffold.FabPosition Center;
     enum_constant public static final androidx.ui.material.Scaffold.FabPosition End;
   }
@@ -268,7 +274,7 @@
   public final class TabRow {
     method @androidx.compose.Composable public void Indicator-e8O-MNM(androidx.ui.core.Modifier modifier = Modifier, long color = contentColor());
     method @androidx.compose.Composable public void IndicatorContainer(java.util.List<androidx.ui.material.TabRow.TabPosition> tabPositions, int selectedIndex, kotlin.jvm.functions.Function0<kotlin.Unit> indicator);
-    field public static final androidx.ui.material.TabRow! INSTANCE;
+    field public static final androidx.ui.material.TabRow INSTANCE;
   }
 
   @androidx.compose.Immutable public static final class TabRow.TabPosition {
@@ -284,7 +290,7 @@
   public final class TextButton {
     method public androidx.ui.layout.InnerPadding getDefaultInnerPadding();
     property public final androidx.ui.layout.InnerPadding DefaultInnerPadding;
-    field public static final androidx.ui.material.TextButton! INSTANCE;
+    field public static final androidx.ui.material.TextButton INSTANCE;
   }
 
   public final class TextFieldKt {
diff --git a/ui/ui-material/icons/core/api/0.1.0-dev15.txt b/ui/ui-material/icons/core/api/0.1.0-dev15.txt
index 49fcc65..e2d6896 100644
--- a/ui/ui-material/icons/core/api/0.1.0-dev15.txt
+++ b/ui/ui-material/icons/core/api/0.1.0-dev15.txt
@@ -4,27 +4,27 @@
   public final class Icons {
     method public androidx.ui.material.icons.Icons.Filled getDefault();
     property public final androidx.ui.material.icons.Icons.Filled Default;
-    field public static final androidx.ui.material.icons.Icons! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons INSTANCE;
   }
 
   public static final class Icons.Filled {
-    field public static final androidx.ui.material.icons.Icons.Filled! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Filled INSTANCE;
   }
 
   public static final class Icons.Outlined {
-    field public static final androidx.ui.material.icons.Icons.Outlined! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Outlined INSTANCE;
   }
 
   public static final class Icons.Rounded {
-    field public static final androidx.ui.material.icons.Icons.Rounded! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Rounded INSTANCE;
   }
 
   public static final class Icons.Sharp {
-    field public static final androidx.ui.material.icons.Icons.Sharp! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Sharp INSTANCE;
   }
 
   public static final class Icons.TwoTone {
-    field public static final androidx.ui.material.icons.Icons.TwoTone! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.TwoTone INSTANCE;
   }
 
   public final class IconsKt {
diff --git a/ui/ui-material/icons/core/api/current.txt b/ui/ui-material/icons/core/api/current.txt
index 49fcc65..e2d6896 100644
--- a/ui/ui-material/icons/core/api/current.txt
+++ b/ui/ui-material/icons/core/api/current.txt
@@ -4,27 +4,27 @@
   public final class Icons {
     method public androidx.ui.material.icons.Icons.Filled getDefault();
     property public final androidx.ui.material.icons.Icons.Filled Default;
-    field public static final androidx.ui.material.icons.Icons! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons INSTANCE;
   }
 
   public static final class Icons.Filled {
-    field public static final androidx.ui.material.icons.Icons.Filled! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Filled INSTANCE;
   }
 
   public static final class Icons.Outlined {
-    field public static final androidx.ui.material.icons.Icons.Outlined! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Outlined INSTANCE;
   }
 
   public static final class Icons.Rounded {
-    field public static final androidx.ui.material.icons.Icons.Rounded! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Rounded INSTANCE;
   }
 
   public static final class Icons.Sharp {
-    field public static final androidx.ui.material.icons.Icons.Sharp! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Sharp INSTANCE;
   }
 
   public static final class Icons.TwoTone {
-    field public static final androidx.ui.material.icons.Icons.TwoTone! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.TwoTone INSTANCE;
   }
 
   public final class IconsKt {
diff --git a/ui/ui-material/icons/core/api/public_plus_experimental_0.1.0-dev15.txt b/ui/ui-material/icons/core/api/public_plus_experimental_0.1.0-dev15.txt
index 49fcc65..e2d6896 100644
--- a/ui/ui-material/icons/core/api/public_plus_experimental_0.1.0-dev15.txt
+++ b/ui/ui-material/icons/core/api/public_plus_experimental_0.1.0-dev15.txt
@@ -4,27 +4,27 @@
   public final class Icons {
     method public androidx.ui.material.icons.Icons.Filled getDefault();
     property public final androidx.ui.material.icons.Icons.Filled Default;
-    field public static final androidx.ui.material.icons.Icons! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons INSTANCE;
   }
 
   public static final class Icons.Filled {
-    field public static final androidx.ui.material.icons.Icons.Filled! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Filled INSTANCE;
   }
 
   public static final class Icons.Outlined {
-    field public static final androidx.ui.material.icons.Icons.Outlined! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Outlined INSTANCE;
   }
 
   public static final class Icons.Rounded {
-    field public static final androidx.ui.material.icons.Icons.Rounded! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Rounded INSTANCE;
   }
 
   public static final class Icons.Sharp {
-    field public static final androidx.ui.material.icons.Icons.Sharp! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Sharp INSTANCE;
   }
 
   public static final class Icons.TwoTone {
-    field public static final androidx.ui.material.icons.Icons.TwoTone! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.TwoTone INSTANCE;
   }
 
   public final class IconsKt {
diff --git a/ui/ui-material/icons/core/api/public_plus_experimental_current.txt b/ui/ui-material/icons/core/api/public_plus_experimental_current.txt
index 49fcc65..e2d6896 100644
--- a/ui/ui-material/icons/core/api/public_plus_experimental_current.txt
+++ b/ui/ui-material/icons/core/api/public_plus_experimental_current.txt
@@ -4,27 +4,27 @@
   public final class Icons {
     method public androidx.ui.material.icons.Icons.Filled getDefault();
     property public final androidx.ui.material.icons.Icons.Filled Default;
-    field public static final androidx.ui.material.icons.Icons! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons INSTANCE;
   }
 
   public static final class Icons.Filled {
-    field public static final androidx.ui.material.icons.Icons.Filled! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Filled INSTANCE;
   }
 
   public static final class Icons.Outlined {
-    field public static final androidx.ui.material.icons.Icons.Outlined! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Outlined INSTANCE;
   }
 
   public static final class Icons.Rounded {
-    field public static final androidx.ui.material.icons.Icons.Rounded! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Rounded INSTANCE;
   }
 
   public static final class Icons.Sharp {
-    field public static final androidx.ui.material.icons.Icons.Sharp! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Sharp INSTANCE;
   }
 
   public static final class Icons.TwoTone {
-    field public static final androidx.ui.material.icons.Icons.TwoTone! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.TwoTone INSTANCE;
   }
 
   public final class IconsKt {
diff --git a/ui/ui-material/icons/core/api/restricted_0.1.0-dev15.txt b/ui/ui-material/icons/core/api/restricted_0.1.0-dev15.txt
index 49fcc65..e2d6896 100644
--- a/ui/ui-material/icons/core/api/restricted_0.1.0-dev15.txt
+++ b/ui/ui-material/icons/core/api/restricted_0.1.0-dev15.txt
@@ -4,27 +4,27 @@
   public final class Icons {
     method public androidx.ui.material.icons.Icons.Filled getDefault();
     property public final androidx.ui.material.icons.Icons.Filled Default;
-    field public static final androidx.ui.material.icons.Icons! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons INSTANCE;
   }
 
   public static final class Icons.Filled {
-    field public static final androidx.ui.material.icons.Icons.Filled! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Filled INSTANCE;
   }
 
   public static final class Icons.Outlined {
-    field public static final androidx.ui.material.icons.Icons.Outlined! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Outlined INSTANCE;
   }
 
   public static final class Icons.Rounded {
-    field public static final androidx.ui.material.icons.Icons.Rounded! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Rounded INSTANCE;
   }
 
   public static final class Icons.Sharp {
-    field public static final androidx.ui.material.icons.Icons.Sharp! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Sharp INSTANCE;
   }
 
   public static final class Icons.TwoTone {
-    field public static final androidx.ui.material.icons.Icons.TwoTone! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.TwoTone INSTANCE;
   }
 
   public final class IconsKt {
diff --git a/ui/ui-material/icons/core/api/restricted_current.txt b/ui/ui-material/icons/core/api/restricted_current.txt
index 49fcc65..e2d6896 100644
--- a/ui/ui-material/icons/core/api/restricted_current.txt
+++ b/ui/ui-material/icons/core/api/restricted_current.txt
@@ -4,27 +4,27 @@
   public final class Icons {
     method public androidx.ui.material.icons.Icons.Filled getDefault();
     property public final androidx.ui.material.icons.Icons.Filled Default;
-    field public static final androidx.ui.material.icons.Icons! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons INSTANCE;
   }
 
   public static final class Icons.Filled {
-    field public static final androidx.ui.material.icons.Icons.Filled! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Filled INSTANCE;
   }
 
   public static final class Icons.Outlined {
-    field public static final androidx.ui.material.icons.Icons.Outlined! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Outlined INSTANCE;
   }
 
   public static final class Icons.Rounded {
-    field public static final androidx.ui.material.icons.Icons.Rounded! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Rounded INSTANCE;
   }
 
   public static final class Icons.Sharp {
-    field public static final androidx.ui.material.icons.Icons.Sharp! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.Sharp INSTANCE;
   }
 
   public static final class Icons.TwoTone {
-    field public static final androidx.ui.material.icons.Icons.TwoTone! INSTANCE;
+    field public static final androidx.ui.material.icons.Icons.TwoTone INSTANCE;
   }
 
   public final class IconsKt {
diff --git a/ui/ui-test/api/0.1.0-dev15.txt b/ui/ui-test/api/0.1.0-dev15.txt
index ca50fe9..2396104 100644
--- a/ui/ui-test/api/0.1.0-dev15.txt
+++ b/ui/ui-test/api/0.1.0-dev15.txt
@@ -300,7 +300,7 @@
     method public boolean matchesAny(Iterable<androidx.ui.core.semantics.SemanticsNode> nodes);
     method public operator androidx.ui.test.SemanticsMatcher not();
     method public infix androidx.ui.test.SemanticsMatcher or(androidx.ui.test.SemanticsMatcher other);
-    field public static final androidx.ui.test.SemanticsMatcher.Companion! Companion;
+    field public static final androidx.ui.test.SemanticsMatcher.Companion Companion;
   }
 
   public static final class SemanticsMatcher.Companion {
diff --git a/ui/ui-test/api/current.txt b/ui/ui-test/api/current.txt
index ca50fe9..2396104 100644
--- a/ui/ui-test/api/current.txt
+++ b/ui/ui-test/api/current.txt
@@ -300,7 +300,7 @@
     method public boolean matchesAny(Iterable<androidx.ui.core.semantics.SemanticsNode> nodes);
     method public operator androidx.ui.test.SemanticsMatcher not();
     method public infix androidx.ui.test.SemanticsMatcher or(androidx.ui.test.SemanticsMatcher other);
-    field public static final androidx.ui.test.SemanticsMatcher.Companion! Companion;
+    field public static final androidx.ui.test.SemanticsMatcher.Companion Companion;
   }
 
   public static final class SemanticsMatcher.Companion {
diff --git a/ui/ui-test/api/public_plus_experimental_0.1.0-dev15.txt b/ui/ui-test/api/public_plus_experimental_0.1.0-dev15.txt
index ca50fe9..2396104 100644
--- a/ui/ui-test/api/public_plus_experimental_0.1.0-dev15.txt
+++ b/ui/ui-test/api/public_plus_experimental_0.1.0-dev15.txt
@@ -300,7 +300,7 @@
     method public boolean matchesAny(Iterable<androidx.ui.core.semantics.SemanticsNode> nodes);
     method public operator androidx.ui.test.SemanticsMatcher not();
     method public infix androidx.ui.test.SemanticsMatcher or(androidx.ui.test.SemanticsMatcher other);
-    field public static final androidx.ui.test.SemanticsMatcher.Companion! Companion;
+    field public static final androidx.ui.test.SemanticsMatcher.Companion Companion;
   }
 
   public static final class SemanticsMatcher.Companion {
diff --git a/ui/ui-test/api/public_plus_experimental_current.txt b/ui/ui-test/api/public_plus_experimental_current.txt
index ca50fe9..2396104 100644
--- a/ui/ui-test/api/public_plus_experimental_current.txt
+++ b/ui/ui-test/api/public_plus_experimental_current.txt
@@ -300,7 +300,7 @@
     method public boolean matchesAny(Iterable<androidx.ui.core.semantics.SemanticsNode> nodes);
     method public operator androidx.ui.test.SemanticsMatcher not();
     method public infix androidx.ui.test.SemanticsMatcher or(androidx.ui.test.SemanticsMatcher other);
-    field public static final androidx.ui.test.SemanticsMatcher.Companion! Companion;
+    field public static final androidx.ui.test.SemanticsMatcher.Companion Companion;
   }
 
   public static final class SemanticsMatcher.Companion {
diff --git a/ui/ui-test/api/restricted_0.1.0-dev15.txt b/ui/ui-test/api/restricted_0.1.0-dev15.txt
index ca50fe9..2396104 100644
--- a/ui/ui-test/api/restricted_0.1.0-dev15.txt
+++ b/ui/ui-test/api/restricted_0.1.0-dev15.txt
@@ -300,7 +300,7 @@
     method public boolean matchesAny(Iterable<androidx.ui.core.semantics.SemanticsNode> nodes);
     method public operator androidx.ui.test.SemanticsMatcher not();
     method public infix androidx.ui.test.SemanticsMatcher or(androidx.ui.test.SemanticsMatcher other);
-    field public static final androidx.ui.test.SemanticsMatcher.Companion! Companion;
+    field public static final androidx.ui.test.SemanticsMatcher.Companion Companion;
   }
 
   public static final class SemanticsMatcher.Companion {
diff --git a/ui/ui-test/api/restricted_current.txt b/ui/ui-test/api/restricted_current.txt
index ca50fe9..2396104 100644
--- a/ui/ui-test/api/restricted_current.txt
+++ b/ui/ui-test/api/restricted_current.txt
@@ -300,7 +300,7 @@
     method public boolean matchesAny(Iterable<androidx.ui.core.semantics.SemanticsNode> nodes);
     method public operator androidx.ui.test.SemanticsMatcher not();
     method public infix androidx.ui.test.SemanticsMatcher or(androidx.ui.test.SemanticsMatcher other);
-    field public static final androidx.ui.test.SemanticsMatcher.Companion! Companion;
+    field public static final androidx.ui.test.SemanticsMatcher.Companion Companion;
   }
 
   public static final class SemanticsMatcher.Companion {
diff --git a/ui/ui-text-core/api/0.1.0-dev15.txt b/ui/ui-text-core/api/0.1.0-dev15.txt
index 2bc82d9..bc4564e 100644
--- a/ui/ui-text-core/api/0.1.0-dev15.txt
+++ b/ui/ui-text-core/api/0.1.0-dev15.txt
@@ -74,6 +74,8 @@
   }
 
   public enum ImeAction {
+    method public static androidx.ui.input.ImeAction valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.input.ImeAction[] values();
     enum_constant public static final androidx.ui.input.ImeAction Done;
     enum_constant public static final androidx.ui.input.ImeAction Go;
     enum_constant public static final androidx.ui.input.ImeAction Next;
@@ -90,6 +92,8 @@
   }
 
   public enum KeyboardType {
+    method public static androidx.ui.input.KeyboardType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.input.KeyboardType[] values();
     enum_constant public static final androidx.ui.input.KeyboardType Ascii;
     enum_constant public static final androidx.ui.input.KeyboardType Email;
     enum_constant public static final androidx.ui.input.KeyboardType Number;
@@ -111,7 +115,7 @@
   public interface OffsetMap {
     method public int originalToTransformed(int offset);
     method public int transformedToOriginal(int offset);
-    field public static final androidx.ui.input.OffsetMap.Companion! Companion;
+    field public static final androidx.ui.input.OffsetMap.Companion Companion;
   }
 
   public static final class OffsetMap.Companion {
@@ -177,7 +181,7 @@
     method public androidx.ui.text.TextRange? getComposition();
     method public androidx.ui.text.TextRange getSelection();
     method public String getText();
-    field public static final androidx.ui.input.TextFieldValue.Companion! Companion;
+    field public static final androidx.ui.input.TextFieldValue.Companion Companion;
   }
 
   public static final class TextFieldValue.Companion {
@@ -219,7 +223,7 @@
 
   @androidx.compose.Immutable public interface VisualTransformation {
     method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
-    field public static final androidx.ui.input.VisualTransformation.Companion! Companion;
+    field public static final androidx.ui.input.VisualTransformation.Companion Companion;
   }
 
   public static final class VisualTransformation.Companion {
@@ -243,7 +247,7 @@
     property public final String language;
     property public final String region;
     property public final String script;
-    field public static final androidx.ui.intl.Locale.Companion! Companion;
+    field public static final androidx.ui.intl.Locale.Companion Companion;
   }
 
   public static final class Locale.Companion {
@@ -265,7 +269,7 @@
     method public boolean isEmpty();
     method public java.util.Iterator<androidx.ui.intl.Locale> iterator();
     property public int size;
-    field public static final androidx.ui.intl.LocaleList.Companion! Companion;
+    field public static final androidx.ui.intl.LocaleList.Companion Companion;
   }
 
   public static final class LocaleList.Companion {
@@ -504,6 +508,8 @@
   }
 
   public enum PlaceholderVerticalAlign {
+    method public static androidx.ui.text.PlaceholderVerticalAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.PlaceholderVerticalAlign[] values();
     enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign AboveBaseline;
     enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Bottom;
     enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Center;
@@ -632,7 +638,7 @@
 
   public final class TextPainter {
     method public void paint(androidx.ui.graphics.Canvas canvas, androidx.ui.text.TextLayoutResult textLayoutResult);
-    field public static final androidx.ui.text.TextPainter! INSTANCE;
+    field public static final androidx.ui.text.TextPainter INSTANCE;
   }
 
   @androidx.compose.Immutable public final class TextRange {
@@ -655,7 +661,7 @@
     property public final int max;
     property public final int min;
     property public final boolean reversed;
-    field public static final androidx.ui.text.TextRange.Companion! Companion;
+    field public static final androidx.ui.text.TextRange.Companion Companion;
   }
 
   public static final class TextRange.Companion {
@@ -714,7 +720,7 @@
     method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.SpanStyle other);
     method @androidx.compose.Stable public androidx.ui.text.ParagraphStyle toParagraphStyle();
     method @androidx.compose.Stable public androidx.ui.text.SpanStyle toSpanStyle();
-    field public static final androidx.ui.text.TextStyle.Companion! Companion;
+    field public static final androidx.ui.text.TextStyle.Companion Companion;
   }
 
   public static final class TextStyle.Companion {
@@ -752,7 +758,7 @@
 
   @androidx.compose.Immutable public abstract sealed class FontFamily {
     method public final boolean getCanLoadSynchronously();
-    field public static final androidx.ui.text.font.FontFamily.Companion! Companion;
+    field public static final androidx.ui.text.font.FontFamily.Companion Companion;
   }
 
   public static final class FontFamily.Companion {
@@ -798,11 +804,15 @@
   }
 
   public enum FontStyle {
+    method public static androidx.ui.text.font.FontStyle valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.font.FontStyle[] values();
     enum_constant public static final androidx.ui.text.font.FontStyle Italic;
     enum_constant public static final androidx.ui.text.font.FontStyle Normal;
   }
 
   public enum FontSynthesis {
+    method public static androidx.ui.text.font.FontSynthesis valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.font.FontSynthesis[] values();
     enum_constant public static final androidx.ui.text.font.FontSynthesis All;
     enum_constant public static final androidx.ui.text.font.FontSynthesis None;
     enum_constant public static final androidx.ui.text.font.FontSynthesis Style;
@@ -815,7 +825,7 @@
     method public int component1();
     method @androidx.compose.Immutable public androidx.ui.text.font.FontWeight copy(int weight);
     method public int getWeight();
-    field public static final androidx.ui.text.font.FontWeight.Companion! Companion;
+    field public static final androidx.ui.text.font.FontWeight.Companion Companion;
   }
 
   public static final class FontWeight.Companion {
@@ -922,7 +932,7 @@
     method public float getMultiplier();
     method @androidx.compose.Immutable public static inline int hashCode-impl(float p);
     method @androidx.compose.Immutable public static inline String! toString-impl(float p);
-    field public static final androidx.ui.text.style.BaselineShift.Companion! Companion;
+    field public static final androidx.ui.text.style.BaselineShift.Companion Companion;
   }
 
   public static final class BaselineShift.Companion {
@@ -939,6 +949,8 @@
   }
 
   public enum TextAlign {
+    method public static androidx.ui.text.style.TextAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextAlign[] values();
     enum_constant public static final androidx.ui.text.style.TextAlign Center;
     enum_constant public static final androidx.ui.text.style.TextAlign End;
     enum_constant public static final androidx.ui.text.style.TextAlign Justify;
@@ -952,7 +964,7 @@
     method public boolean contains(androidx.ui.text.style.TextDecoration other);
     method @androidx.compose.Immutable public androidx.ui.text.style.TextDecoration copy(int mask);
     method public int getMask();
-    field public static final androidx.ui.text.style.TextDecoration.Companion! Companion;
+    field public static final androidx.ui.text.style.TextDecoration.Companion Companion;
   }
 
   public static final class TextDecoration.Companion {
@@ -966,11 +978,15 @@
   }
 
   public enum TextDirection {
+    method public static androidx.ui.text.style.TextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextDirection[] values();
     enum_constant public static final androidx.ui.text.style.TextDirection Ltr;
     enum_constant public static final androidx.ui.text.style.TextDirection Rtl;
   }
 
   public enum TextDirectionAlgorithm {
+    method public static androidx.ui.text.style.TextDirectionAlgorithm valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextDirectionAlgorithm[] values();
     enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ContentOrLtr;
     enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ContentOrRtl;
     enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ForceLtr;
@@ -985,7 +1001,7 @@
     method @androidx.compose.Immutable public androidx.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
     method public float getScaleX();
     method public float getSkewX();
-    field public static final androidx.ui.text.style.TextGeometricTransform.Companion! Companion;
+    field public static final androidx.ui.text.style.TextGeometricTransform.Companion Companion;
   }
 
   public static final class TextGeometricTransform.Companion {
@@ -1001,7 +1017,7 @@
     method @androidx.compose.Immutable public androidx.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
     method public long getFirstLine();
     method public long getRestLine();
-    field public static final androidx.ui.text.style.TextIndent.Companion! Companion;
+    field public static final androidx.ui.text.style.TextIndent.Companion Companion;
   }
 
   public static final class TextIndent.Companion {
@@ -1014,6 +1030,8 @@
   }
 
   public enum TextOverflow {
+    method public static androidx.ui.text.style.TextOverflow valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextOverflow[] values();
     enum_constant public static final androidx.ui.text.style.TextOverflow Clip;
     enum_constant public static final androidx.ui.text.style.TextOverflow Ellipsis;
   }
diff --git a/ui/ui-text-core/api/current.txt b/ui/ui-text-core/api/current.txt
index 2bc82d9..bc4564e 100644
--- a/ui/ui-text-core/api/current.txt
+++ b/ui/ui-text-core/api/current.txt
@@ -74,6 +74,8 @@
   }
 
   public enum ImeAction {
+    method public static androidx.ui.input.ImeAction valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.input.ImeAction[] values();
     enum_constant public static final androidx.ui.input.ImeAction Done;
     enum_constant public static final androidx.ui.input.ImeAction Go;
     enum_constant public static final androidx.ui.input.ImeAction Next;
@@ -90,6 +92,8 @@
   }
 
   public enum KeyboardType {
+    method public static androidx.ui.input.KeyboardType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.input.KeyboardType[] values();
     enum_constant public static final androidx.ui.input.KeyboardType Ascii;
     enum_constant public static final androidx.ui.input.KeyboardType Email;
     enum_constant public static final androidx.ui.input.KeyboardType Number;
@@ -111,7 +115,7 @@
   public interface OffsetMap {
     method public int originalToTransformed(int offset);
     method public int transformedToOriginal(int offset);
-    field public static final androidx.ui.input.OffsetMap.Companion! Companion;
+    field public static final androidx.ui.input.OffsetMap.Companion Companion;
   }
 
   public static final class OffsetMap.Companion {
@@ -177,7 +181,7 @@
     method public androidx.ui.text.TextRange? getComposition();
     method public androidx.ui.text.TextRange getSelection();
     method public String getText();
-    field public static final androidx.ui.input.TextFieldValue.Companion! Companion;
+    field public static final androidx.ui.input.TextFieldValue.Companion Companion;
   }
 
   public static final class TextFieldValue.Companion {
@@ -219,7 +223,7 @@
 
   @androidx.compose.Immutable public interface VisualTransformation {
     method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
-    field public static final androidx.ui.input.VisualTransformation.Companion! Companion;
+    field public static final androidx.ui.input.VisualTransformation.Companion Companion;
   }
 
   public static final class VisualTransformation.Companion {
@@ -243,7 +247,7 @@
     property public final String language;
     property public final String region;
     property public final String script;
-    field public static final androidx.ui.intl.Locale.Companion! Companion;
+    field public static final androidx.ui.intl.Locale.Companion Companion;
   }
 
   public static final class Locale.Companion {
@@ -265,7 +269,7 @@
     method public boolean isEmpty();
     method public java.util.Iterator<androidx.ui.intl.Locale> iterator();
     property public int size;
-    field public static final androidx.ui.intl.LocaleList.Companion! Companion;
+    field public static final androidx.ui.intl.LocaleList.Companion Companion;
   }
 
   public static final class LocaleList.Companion {
@@ -504,6 +508,8 @@
   }
 
   public enum PlaceholderVerticalAlign {
+    method public static androidx.ui.text.PlaceholderVerticalAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.PlaceholderVerticalAlign[] values();
     enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign AboveBaseline;
     enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Bottom;
     enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Center;
@@ -632,7 +638,7 @@
 
   public final class TextPainter {
     method public void paint(androidx.ui.graphics.Canvas canvas, androidx.ui.text.TextLayoutResult textLayoutResult);
-    field public static final androidx.ui.text.TextPainter! INSTANCE;
+    field public static final androidx.ui.text.TextPainter INSTANCE;
   }
 
   @androidx.compose.Immutable public final class TextRange {
@@ -655,7 +661,7 @@
     property public final int max;
     property public final int min;
     property public final boolean reversed;
-    field public static final androidx.ui.text.TextRange.Companion! Companion;
+    field public static final androidx.ui.text.TextRange.Companion Companion;
   }
 
   public static final class TextRange.Companion {
@@ -714,7 +720,7 @@
     method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.SpanStyle other);
     method @androidx.compose.Stable public androidx.ui.text.ParagraphStyle toParagraphStyle();
     method @androidx.compose.Stable public androidx.ui.text.SpanStyle toSpanStyle();
-    field public static final androidx.ui.text.TextStyle.Companion! Companion;
+    field public static final androidx.ui.text.TextStyle.Companion Companion;
   }
 
   public static final class TextStyle.Companion {
@@ -752,7 +758,7 @@
 
   @androidx.compose.Immutable public abstract sealed class FontFamily {
     method public final boolean getCanLoadSynchronously();
-    field public static final androidx.ui.text.font.FontFamily.Companion! Companion;
+    field public static final androidx.ui.text.font.FontFamily.Companion Companion;
   }
 
   public static final class FontFamily.Companion {
@@ -798,11 +804,15 @@
   }
 
   public enum FontStyle {
+    method public static androidx.ui.text.font.FontStyle valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.font.FontStyle[] values();
     enum_constant public static final androidx.ui.text.font.FontStyle Italic;
     enum_constant public static final androidx.ui.text.font.FontStyle Normal;
   }
 
   public enum FontSynthesis {
+    method public static androidx.ui.text.font.FontSynthesis valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.font.FontSynthesis[] values();
     enum_constant public static final androidx.ui.text.font.FontSynthesis All;
     enum_constant public static final androidx.ui.text.font.FontSynthesis None;
     enum_constant public static final androidx.ui.text.font.FontSynthesis Style;
@@ -815,7 +825,7 @@
     method public int component1();
     method @androidx.compose.Immutable public androidx.ui.text.font.FontWeight copy(int weight);
     method public int getWeight();
-    field public static final androidx.ui.text.font.FontWeight.Companion! Companion;
+    field public static final androidx.ui.text.font.FontWeight.Companion Companion;
   }
 
   public static final class FontWeight.Companion {
@@ -922,7 +932,7 @@
     method public float getMultiplier();
     method @androidx.compose.Immutable public static inline int hashCode-impl(float p);
     method @androidx.compose.Immutable public static inline String! toString-impl(float p);
-    field public static final androidx.ui.text.style.BaselineShift.Companion! Companion;
+    field public static final androidx.ui.text.style.BaselineShift.Companion Companion;
   }
 
   public static final class BaselineShift.Companion {
@@ -939,6 +949,8 @@
   }
 
   public enum TextAlign {
+    method public static androidx.ui.text.style.TextAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextAlign[] values();
     enum_constant public static final androidx.ui.text.style.TextAlign Center;
     enum_constant public static final androidx.ui.text.style.TextAlign End;
     enum_constant public static final androidx.ui.text.style.TextAlign Justify;
@@ -952,7 +964,7 @@
     method public boolean contains(androidx.ui.text.style.TextDecoration other);
     method @androidx.compose.Immutable public androidx.ui.text.style.TextDecoration copy(int mask);
     method public int getMask();
-    field public static final androidx.ui.text.style.TextDecoration.Companion! Companion;
+    field public static final androidx.ui.text.style.TextDecoration.Companion Companion;
   }
 
   public static final class TextDecoration.Companion {
@@ -966,11 +978,15 @@
   }
 
   public enum TextDirection {
+    method public static androidx.ui.text.style.TextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextDirection[] values();
     enum_constant public static final androidx.ui.text.style.TextDirection Ltr;
     enum_constant public static final androidx.ui.text.style.TextDirection Rtl;
   }
 
   public enum TextDirectionAlgorithm {
+    method public static androidx.ui.text.style.TextDirectionAlgorithm valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextDirectionAlgorithm[] values();
     enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ContentOrLtr;
     enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ContentOrRtl;
     enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ForceLtr;
@@ -985,7 +1001,7 @@
     method @androidx.compose.Immutable public androidx.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
     method public float getScaleX();
     method public float getSkewX();
-    field public static final androidx.ui.text.style.TextGeometricTransform.Companion! Companion;
+    field public static final androidx.ui.text.style.TextGeometricTransform.Companion Companion;
   }
 
   public static final class TextGeometricTransform.Companion {
@@ -1001,7 +1017,7 @@
     method @androidx.compose.Immutable public androidx.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
     method public long getFirstLine();
     method public long getRestLine();
-    field public static final androidx.ui.text.style.TextIndent.Companion! Companion;
+    field public static final androidx.ui.text.style.TextIndent.Companion Companion;
   }
 
   public static final class TextIndent.Companion {
@@ -1014,6 +1030,8 @@
   }
 
   public enum TextOverflow {
+    method public static androidx.ui.text.style.TextOverflow valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextOverflow[] values();
     enum_constant public static final androidx.ui.text.style.TextOverflow Clip;
     enum_constant public static final androidx.ui.text.style.TextOverflow Ellipsis;
   }
diff --git a/ui/ui-text-core/api/public_plus_experimental_0.1.0-dev15.txt b/ui/ui-text-core/api/public_plus_experimental_0.1.0-dev15.txt
index 2bc82d9..bc4564e 100644
--- a/ui/ui-text-core/api/public_plus_experimental_0.1.0-dev15.txt
+++ b/ui/ui-text-core/api/public_plus_experimental_0.1.0-dev15.txt
@@ -74,6 +74,8 @@
   }
 
   public enum ImeAction {
+    method public static androidx.ui.input.ImeAction valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.input.ImeAction[] values();
     enum_constant public static final androidx.ui.input.ImeAction Done;
     enum_constant public static final androidx.ui.input.ImeAction Go;
     enum_constant public static final androidx.ui.input.ImeAction Next;
@@ -90,6 +92,8 @@
   }
 
   public enum KeyboardType {
+    method public static androidx.ui.input.KeyboardType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.input.KeyboardType[] values();
     enum_constant public static final androidx.ui.input.KeyboardType Ascii;
     enum_constant public static final androidx.ui.input.KeyboardType Email;
     enum_constant public static final androidx.ui.input.KeyboardType Number;
@@ -111,7 +115,7 @@
   public interface OffsetMap {
     method public int originalToTransformed(int offset);
     method public int transformedToOriginal(int offset);
-    field public static final androidx.ui.input.OffsetMap.Companion! Companion;
+    field public static final androidx.ui.input.OffsetMap.Companion Companion;
   }
 
   public static final class OffsetMap.Companion {
@@ -177,7 +181,7 @@
     method public androidx.ui.text.TextRange? getComposition();
     method public androidx.ui.text.TextRange getSelection();
     method public String getText();
-    field public static final androidx.ui.input.TextFieldValue.Companion! Companion;
+    field public static final androidx.ui.input.TextFieldValue.Companion Companion;
   }
 
   public static final class TextFieldValue.Companion {
@@ -219,7 +223,7 @@
 
   @androidx.compose.Immutable public interface VisualTransformation {
     method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
-    field public static final androidx.ui.input.VisualTransformation.Companion! Companion;
+    field public static final androidx.ui.input.VisualTransformation.Companion Companion;
   }
 
   public static final class VisualTransformation.Companion {
@@ -243,7 +247,7 @@
     property public final String language;
     property public final String region;
     property public final String script;
-    field public static final androidx.ui.intl.Locale.Companion! Companion;
+    field public static final androidx.ui.intl.Locale.Companion Companion;
   }
 
   public static final class Locale.Companion {
@@ -265,7 +269,7 @@
     method public boolean isEmpty();
     method public java.util.Iterator<androidx.ui.intl.Locale> iterator();
     property public int size;
-    field public static final androidx.ui.intl.LocaleList.Companion! Companion;
+    field public static final androidx.ui.intl.LocaleList.Companion Companion;
   }
 
   public static final class LocaleList.Companion {
@@ -504,6 +508,8 @@
   }
 
   public enum PlaceholderVerticalAlign {
+    method public static androidx.ui.text.PlaceholderVerticalAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.PlaceholderVerticalAlign[] values();
     enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign AboveBaseline;
     enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Bottom;
     enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Center;
@@ -632,7 +638,7 @@
 
   public final class TextPainter {
     method public void paint(androidx.ui.graphics.Canvas canvas, androidx.ui.text.TextLayoutResult textLayoutResult);
-    field public static final androidx.ui.text.TextPainter! INSTANCE;
+    field public static final androidx.ui.text.TextPainter INSTANCE;
   }
 
   @androidx.compose.Immutable public final class TextRange {
@@ -655,7 +661,7 @@
     property public final int max;
     property public final int min;
     property public final boolean reversed;
-    field public static final androidx.ui.text.TextRange.Companion! Companion;
+    field public static final androidx.ui.text.TextRange.Companion Companion;
   }
 
   public static final class TextRange.Companion {
@@ -714,7 +720,7 @@
     method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.SpanStyle other);
     method @androidx.compose.Stable public androidx.ui.text.ParagraphStyle toParagraphStyle();
     method @androidx.compose.Stable public androidx.ui.text.SpanStyle toSpanStyle();
-    field public static final androidx.ui.text.TextStyle.Companion! Companion;
+    field public static final androidx.ui.text.TextStyle.Companion Companion;
   }
 
   public static final class TextStyle.Companion {
@@ -752,7 +758,7 @@
 
   @androidx.compose.Immutable public abstract sealed class FontFamily {
     method public final boolean getCanLoadSynchronously();
-    field public static final androidx.ui.text.font.FontFamily.Companion! Companion;
+    field public static final androidx.ui.text.font.FontFamily.Companion Companion;
   }
 
   public static final class FontFamily.Companion {
@@ -798,11 +804,15 @@
   }
 
   public enum FontStyle {
+    method public static androidx.ui.text.font.FontStyle valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.font.FontStyle[] values();
     enum_constant public static final androidx.ui.text.font.FontStyle Italic;
     enum_constant public static final androidx.ui.text.font.FontStyle Normal;
   }
 
   public enum FontSynthesis {
+    method public static androidx.ui.text.font.FontSynthesis valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.font.FontSynthesis[] values();
     enum_constant public static final androidx.ui.text.font.FontSynthesis All;
     enum_constant public static final androidx.ui.text.font.FontSynthesis None;
     enum_constant public static final androidx.ui.text.font.FontSynthesis Style;
@@ -815,7 +825,7 @@
     method public int component1();
     method @androidx.compose.Immutable public androidx.ui.text.font.FontWeight copy(int weight);
     method public int getWeight();
-    field public static final androidx.ui.text.font.FontWeight.Companion! Companion;
+    field public static final androidx.ui.text.font.FontWeight.Companion Companion;
   }
 
   public static final class FontWeight.Companion {
@@ -922,7 +932,7 @@
     method public float getMultiplier();
     method @androidx.compose.Immutable public static inline int hashCode-impl(float p);
     method @androidx.compose.Immutable public static inline String! toString-impl(float p);
-    field public static final androidx.ui.text.style.BaselineShift.Companion! Companion;
+    field public static final androidx.ui.text.style.BaselineShift.Companion Companion;
   }
 
   public static final class BaselineShift.Companion {
@@ -939,6 +949,8 @@
   }
 
   public enum TextAlign {
+    method public static androidx.ui.text.style.TextAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextAlign[] values();
     enum_constant public static final androidx.ui.text.style.TextAlign Center;
     enum_constant public static final androidx.ui.text.style.TextAlign End;
     enum_constant public static final androidx.ui.text.style.TextAlign Justify;
@@ -952,7 +964,7 @@
     method public boolean contains(androidx.ui.text.style.TextDecoration other);
     method @androidx.compose.Immutable public androidx.ui.text.style.TextDecoration copy(int mask);
     method public int getMask();
-    field public static final androidx.ui.text.style.TextDecoration.Companion! Companion;
+    field public static final androidx.ui.text.style.TextDecoration.Companion Companion;
   }
 
   public static final class TextDecoration.Companion {
@@ -966,11 +978,15 @@
   }
 
   public enum TextDirection {
+    method public static androidx.ui.text.style.TextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextDirection[] values();
     enum_constant public static final androidx.ui.text.style.TextDirection Ltr;
     enum_constant public static final androidx.ui.text.style.TextDirection Rtl;
   }
 
   public enum TextDirectionAlgorithm {
+    method public static androidx.ui.text.style.TextDirectionAlgorithm valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextDirectionAlgorithm[] values();
     enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ContentOrLtr;
     enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ContentOrRtl;
     enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ForceLtr;
@@ -985,7 +1001,7 @@
     method @androidx.compose.Immutable public androidx.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
     method public float getScaleX();
     method public float getSkewX();
-    field public static final androidx.ui.text.style.TextGeometricTransform.Companion! Companion;
+    field public static final androidx.ui.text.style.TextGeometricTransform.Companion Companion;
   }
 
   public static final class TextGeometricTransform.Companion {
@@ -1001,7 +1017,7 @@
     method @androidx.compose.Immutable public androidx.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
     method public long getFirstLine();
     method public long getRestLine();
-    field public static final androidx.ui.text.style.TextIndent.Companion! Companion;
+    field public static final androidx.ui.text.style.TextIndent.Companion Companion;
   }
 
   public static final class TextIndent.Companion {
@@ -1014,6 +1030,8 @@
   }
 
   public enum TextOverflow {
+    method public static androidx.ui.text.style.TextOverflow valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextOverflow[] values();
     enum_constant public static final androidx.ui.text.style.TextOverflow Clip;
     enum_constant public static final androidx.ui.text.style.TextOverflow Ellipsis;
   }
diff --git a/ui/ui-text-core/api/public_plus_experimental_current.txt b/ui/ui-text-core/api/public_plus_experimental_current.txt
index 2bc82d9..bc4564e 100644
--- a/ui/ui-text-core/api/public_plus_experimental_current.txt
+++ b/ui/ui-text-core/api/public_plus_experimental_current.txt
@@ -74,6 +74,8 @@
   }
 
   public enum ImeAction {
+    method public static androidx.ui.input.ImeAction valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.input.ImeAction[] values();
     enum_constant public static final androidx.ui.input.ImeAction Done;
     enum_constant public static final androidx.ui.input.ImeAction Go;
     enum_constant public static final androidx.ui.input.ImeAction Next;
@@ -90,6 +92,8 @@
   }
 
   public enum KeyboardType {
+    method public static androidx.ui.input.KeyboardType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.input.KeyboardType[] values();
     enum_constant public static final androidx.ui.input.KeyboardType Ascii;
     enum_constant public static final androidx.ui.input.KeyboardType Email;
     enum_constant public static final androidx.ui.input.KeyboardType Number;
@@ -111,7 +115,7 @@
   public interface OffsetMap {
     method public int originalToTransformed(int offset);
     method public int transformedToOriginal(int offset);
-    field public static final androidx.ui.input.OffsetMap.Companion! Companion;
+    field public static final androidx.ui.input.OffsetMap.Companion Companion;
   }
 
   public static final class OffsetMap.Companion {
@@ -177,7 +181,7 @@
     method public androidx.ui.text.TextRange? getComposition();
     method public androidx.ui.text.TextRange getSelection();
     method public String getText();
-    field public static final androidx.ui.input.TextFieldValue.Companion! Companion;
+    field public static final androidx.ui.input.TextFieldValue.Companion Companion;
   }
 
   public static final class TextFieldValue.Companion {
@@ -219,7 +223,7 @@
 
   @androidx.compose.Immutable public interface VisualTransformation {
     method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
-    field public static final androidx.ui.input.VisualTransformation.Companion! Companion;
+    field public static final androidx.ui.input.VisualTransformation.Companion Companion;
   }
 
   public static final class VisualTransformation.Companion {
@@ -243,7 +247,7 @@
     property public final String language;
     property public final String region;
     property public final String script;
-    field public static final androidx.ui.intl.Locale.Companion! Companion;
+    field public static final androidx.ui.intl.Locale.Companion Companion;
   }
 
   public static final class Locale.Companion {
@@ -265,7 +269,7 @@
     method public boolean isEmpty();
     method public java.util.Iterator<androidx.ui.intl.Locale> iterator();
     property public int size;
-    field public static final androidx.ui.intl.LocaleList.Companion! Companion;
+    field public static final androidx.ui.intl.LocaleList.Companion Companion;
   }
 
   public static final class LocaleList.Companion {
@@ -504,6 +508,8 @@
   }
 
   public enum PlaceholderVerticalAlign {
+    method public static androidx.ui.text.PlaceholderVerticalAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.PlaceholderVerticalAlign[] values();
     enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign AboveBaseline;
     enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Bottom;
     enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Center;
@@ -632,7 +638,7 @@
 
   public final class TextPainter {
     method public void paint(androidx.ui.graphics.Canvas canvas, androidx.ui.text.TextLayoutResult textLayoutResult);
-    field public static final androidx.ui.text.TextPainter! INSTANCE;
+    field public static final androidx.ui.text.TextPainter INSTANCE;
   }
 
   @androidx.compose.Immutable public final class TextRange {
@@ -655,7 +661,7 @@
     property public final int max;
     property public final int min;
     property public final boolean reversed;
-    field public static final androidx.ui.text.TextRange.Companion! Companion;
+    field public static final androidx.ui.text.TextRange.Companion Companion;
   }
 
   public static final class TextRange.Companion {
@@ -714,7 +720,7 @@
     method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.SpanStyle other);
     method @androidx.compose.Stable public androidx.ui.text.ParagraphStyle toParagraphStyle();
     method @androidx.compose.Stable public androidx.ui.text.SpanStyle toSpanStyle();
-    field public static final androidx.ui.text.TextStyle.Companion! Companion;
+    field public static final androidx.ui.text.TextStyle.Companion Companion;
   }
 
   public static final class TextStyle.Companion {
@@ -752,7 +758,7 @@
 
   @androidx.compose.Immutable public abstract sealed class FontFamily {
     method public final boolean getCanLoadSynchronously();
-    field public static final androidx.ui.text.font.FontFamily.Companion! Companion;
+    field public static final androidx.ui.text.font.FontFamily.Companion Companion;
   }
 
   public static final class FontFamily.Companion {
@@ -798,11 +804,15 @@
   }
 
   public enum FontStyle {
+    method public static androidx.ui.text.font.FontStyle valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.font.FontStyle[] values();
     enum_constant public static final androidx.ui.text.font.FontStyle Italic;
     enum_constant public static final androidx.ui.text.font.FontStyle Normal;
   }
 
   public enum FontSynthesis {
+    method public static androidx.ui.text.font.FontSynthesis valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.font.FontSynthesis[] values();
     enum_constant public static final androidx.ui.text.font.FontSynthesis All;
     enum_constant public static final androidx.ui.text.font.FontSynthesis None;
     enum_constant public static final androidx.ui.text.font.FontSynthesis Style;
@@ -815,7 +825,7 @@
     method public int component1();
     method @androidx.compose.Immutable public androidx.ui.text.font.FontWeight copy(int weight);
     method public int getWeight();
-    field public static final androidx.ui.text.font.FontWeight.Companion! Companion;
+    field public static final androidx.ui.text.font.FontWeight.Companion Companion;
   }
 
   public static final class FontWeight.Companion {
@@ -922,7 +932,7 @@
     method public float getMultiplier();
     method @androidx.compose.Immutable public static inline int hashCode-impl(float p);
     method @androidx.compose.Immutable public static inline String! toString-impl(float p);
-    field public static final androidx.ui.text.style.BaselineShift.Companion! Companion;
+    field public static final androidx.ui.text.style.BaselineShift.Companion Companion;
   }
 
   public static final class BaselineShift.Companion {
@@ -939,6 +949,8 @@
   }
 
   public enum TextAlign {
+    method public static androidx.ui.text.style.TextAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextAlign[] values();
     enum_constant public static final androidx.ui.text.style.TextAlign Center;
     enum_constant public static final androidx.ui.text.style.TextAlign End;
     enum_constant public static final androidx.ui.text.style.TextAlign Justify;
@@ -952,7 +964,7 @@
     method public boolean contains(androidx.ui.text.style.TextDecoration other);
     method @androidx.compose.Immutable public androidx.ui.text.style.TextDecoration copy(int mask);
     method public int getMask();
-    field public static final androidx.ui.text.style.TextDecoration.Companion! Companion;
+    field public static final androidx.ui.text.style.TextDecoration.Companion Companion;
   }
 
   public static final class TextDecoration.Companion {
@@ -966,11 +978,15 @@
   }
 
   public enum TextDirection {
+    method public static androidx.ui.text.style.TextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextDirection[] values();
     enum_constant public static final androidx.ui.text.style.TextDirection Ltr;
     enum_constant public static final androidx.ui.text.style.TextDirection Rtl;
   }
 
   public enum TextDirectionAlgorithm {
+    method public static androidx.ui.text.style.TextDirectionAlgorithm valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextDirectionAlgorithm[] values();
     enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ContentOrLtr;
     enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ContentOrRtl;
     enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ForceLtr;
@@ -985,7 +1001,7 @@
     method @androidx.compose.Immutable public androidx.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
     method public float getScaleX();
     method public float getSkewX();
-    field public static final androidx.ui.text.style.TextGeometricTransform.Companion! Companion;
+    field public static final androidx.ui.text.style.TextGeometricTransform.Companion Companion;
   }
 
   public static final class TextGeometricTransform.Companion {
@@ -1001,7 +1017,7 @@
     method @androidx.compose.Immutable public androidx.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
     method public long getFirstLine();
     method public long getRestLine();
-    field public static final androidx.ui.text.style.TextIndent.Companion! Companion;
+    field public static final androidx.ui.text.style.TextIndent.Companion Companion;
   }
 
   public static final class TextIndent.Companion {
@@ -1014,6 +1030,8 @@
   }
 
   public enum TextOverflow {
+    method public static androidx.ui.text.style.TextOverflow valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextOverflow[] values();
     enum_constant public static final androidx.ui.text.style.TextOverflow Clip;
     enum_constant public static final androidx.ui.text.style.TextOverflow Ellipsis;
   }
diff --git a/ui/ui-text-core/api/restricted_0.1.0-dev15.txt b/ui/ui-text-core/api/restricted_0.1.0-dev15.txt
index 2bc82d9..bc4564e 100644
--- a/ui/ui-text-core/api/restricted_0.1.0-dev15.txt
+++ b/ui/ui-text-core/api/restricted_0.1.0-dev15.txt
@@ -74,6 +74,8 @@
   }
 
   public enum ImeAction {
+    method public static androidx.ui.input.ImeAction valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.input.ImeAction[] values();
     enum_constant public static final androidx.ui.input.ImeAction Done;
     enum_constant public static final androidx.ui.input.ImeAction Go;
     enum_constant public static final androidx.ui.input.ImeAction Next;
@@ -90,6 +92,8 @@
   }
 
   public enum KeyboardType {
+    method public static androidx.ui.input.KeyboardType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.input.KeyboardType[] values();
     enum_constant public static final androidx.ui.input.KeyboardType Ascii;
     enum_constant public static final androidx.ui.input.KeyboardType Email;
     enum_constant public static final androidx.ui.input.KeyboardType Number;
@@ -111,7 +115,7 @@
   public interface OffsetMap {
     method public int originalToTransformed(int offset);
     method public int transformedToOriginal(int offset);
-    field public static final androidx.ui.input.OffsetMap.Companion! Companion;
+    field public static final androidx.ui.input.OffsetMap.Companion Companion;
   }
 
   public static final class OffsetMap.Companion {
@@ -177,7 +181,7 @@
     method public androidx.ui.text.TextRange? getComposition();
     method public androidx.ui.text.TextRange getSelection();
     method public String getText();
-    field public static final androidx.ui.input.TextFieldValue.Companion! Companion;
+    field public static final androidx.ui.input.TextFieldValue.Companion Companion;
   }
 
   public static final class TextFieldValue.Companion {
@@ -219,7 +223,7 @@
 
   @androidx.compose.Immutable public interface VisualTransformation {
     method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
-    field public static final androidx.ui.input.VisualTransformation.Companion! Companion;
+    field public static final androidx.ui.input.VisualTransformation.Companion Companion;
   }
 
   public static final class VisualTransformation.Companion {
@@ -243,7 +247,7 @@
     property public final String language;
     property public final String region;
     property public final String script;
-    field public static final androidx.ui.intl.Locale.Companion! Companion;
+    field public static final androidx.ui.intl.Locale.Companion Companion;
   }
 
   public static final class Locale.Companion {
@@ -265,7 +269,7 @@
     method public boolean isEmpty();
     method public java.util.Iterator<androidx.ui.intl.Locale> iterator();
     property public int size;
-    field public static final androidx.ui.intl.LocaleList.Companion! Companion;
+    field public static final androidx.ui.intl.LocaleList.Companion Companion;
   }
 
   public static final class LocaleList.Companion {
@@ -504,6 +508,8 @@
   }
 
   public enum PlaceholderVerticalAlign {
+    method public static androidx.ui.text.PlaceholderVerticalAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.PlaceholderVerticalAlign[] values();
     enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign AboveBaseline;
     enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Bottom;
     enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Center;
@@ -632,7 +638,7 @@
 
   public final class TextPainter {
     method public void paint(androidx.ui.graphics.Canvas canvas, androidx.ui.text.TextLayoutResult textLayoutResult);
-    field public static final androidx.ui.text.TextPainter! INSTANCE;
+    field public static final androidx.ui.text.TextPainter INSTANCE;
   }
 
   @androidx.compose.Immutable public final class TextRange {
@@ -655,7 +661,7 @@
     property public final int max;
     property public final int min;
     property public final boolean reversed;
-    field public static final androidx.ui.text.TextRange.Companion! Companion;
+    field public static final androidx.ui.text.TextRange.Companion Companion;
   }
 
   public static final class TextRange.Companion {
@@ -714,7 +720,7 @@
     method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.SpanStyle other);
     method @androidx.compose.Stable public androidx.ui.text.ParagraphStyle toParagraphStyle();
     method @androidx.compose.Stable public androidx.ui.text.SpanStyle toSpanStyle();
-    field public static final androidx.ui.text.TextStyle.Companion! Companion;
+    field public static final androidx.ui.text.TextStyle.Companion Companion;
   }
 
   public static final class TextStyle.Companion {
@@ -752,7 +758,7 @@
 
   @androidx.compose.Immutable public abstract sealed class FontFamily {
     method public final boolean getCanLoadSynchronously();
-    field public static final androidx.ui.text.font.FontFamily.Companion! Companion;
+    field public static final androidx.ui.text.font.FontFamily.Companion Companion;
   }
 
   public static final class FontFamily.Companion {
@@ -798,11 +804,15 @@
   }
 
   public enum FontStyle {
+    method public static androidx.ui.text.font.FontStyle valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.font.FontStyle[] values();
     enum_constant public static final androidx.ui.text.font.FontStyle Italic;
     enum_constant public static final androidx.ui.text.font.FontStyle Normal;
   }
 
   public enum FontSynthesis {
+    method public static androidx.ui.text.font.FontSynthesis valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.font.FontSynthesis[] values();
     enum_constant public static final androidx.ui.text.font.FontSynthesis All;
     enum_constant public static final androidx.ui.text.font.FontSynthesis None;
     enum_constant public static final androidx.ui.text.font.FontSynthesis Style;
@@ -815,7 +825,7 @@
     method public int component1();
     method @androidx.compose.Immutable public androidx.ui.text.font.FontWeight copy(int weight);
     method public int getWeight();
-    field public static final androidx.ui.text.font.FontWeight.Companion! Companion;
+    field public static final androidx.ui.text.font.FontWeight.Companion Companion;
   }
 
   public static final class FontWeight.Companion {
@@ -922,7 +932,7 @@
     method public float getMultiplier();
     method @androidx.compose.Immutable public static inline int hashCode-impl(float p);
     method @androidx.compose.Immutable public static inline String! toString-impl(float p);
-    field public static final androidx.ui.text.style.BaselineShift.Companion! Companion;
+    field public static final androidx.ui.text.style.BaselineShift.Companion Companion;
   }
 
   public static final class BaselineShift.Companion {
@@ -939,6 +949,8 @@
   }
 
   public enum TextAlign {
+    method public static androidx.ui.text.style.TextAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextAlign[] values();
     enum_constant public static final androidx.ui.text.style.TextAlign Center;
     enum_constant public static final androidx.ui.text.style.TextAlign End;
     enum_constant public static final androidx.ui.text.style.TextAlign Justify;
@@ -952,7 +964,7 @@
     method public boolean contains(androidx.ui.text.style.TextDecoration other);
     method @androidx.compose.Immutable public androidx.ui.text.style.TextDecoration copy(int mask);
     method public int getMask();
-    field public static final androidx.ui.text.style.TextDecoration.Companion! Companion;
+    field public static final androidx.ui.text.style.TextDecoration.Companion Companion;
   }
 
   public static final class TextDecoration.Companion {
@@ -966,11 +978,15 @@
   }
 
   public enum TextDirection {
+    method public static androidx.ui.text.style.TextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextDirection[] values();
     enum_constant public static final androidx.ui.text.style.TextDirection Ltr;
     enum_constant public static final androidx.ui.text.style.TextDirection Rtl;
   }
 
   public enum TextDirectionAlgorithm {
+    method public static androidx.ui.text.style.TextDirectionAlgorithm valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextDirectionAlgorithm[] values();
     enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ContentOrLtr;
     enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ContentOrRtl;
     enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ForceLtr;
@@ -985,7 +1001,7 @@
     method @androidx.compose.Immutable public androidx.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
     method public float getScaleX();
     method public float getSkewX();
-    field public static final androidx.ui.text.style.TextGeometricTransform.Companion! Companion;
+    field public static final androidx.ui.text.style.TextGeometricTransform.Companion Companion;
   }
 
   public static final class TextGeometricTransform.Companion {
@@ -1001,7 +1017,7 @@
     method @androidx.compose.Immutable public androidx.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
     method public long getFirstLine();
     method public long getRestLine();
-    field public static final androidx.ui.text.style.TextIndent.Companion! Companion;
+    field public static final androidx.ui.text.style.TextIndent.Companion Companion;
   }
 
   public static final class TextIndent.Companion {
@@ -1014,6 +1030,8 @@
   }
 
   public enum TextOverflow {
+    method public static androidx.ui.text.style.TextOverflow valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextOverflow[] values();
     enum_constant public static final androidx.ui.text.style.TextOverflow Clip;
     enum_constant public static final androidx.ui.text.style.TextOverflow Ellipsis;
   }
diff --git a/ui/ui-text-core/api/restricted_current.txt b/ui/ui-text-core/api/restricted_current.txt
index 2bc82d9..bc4564e 100644
--- a/ui/ui-text-core/api/restricted_current.txt
+++ b/ui/ui-text-core/api/restricted_current.txt
@@ -74,6 +74,8 @@
   }
 
   public enum ImeAction {
+    method public static androidx.ui.input.ImeAction valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.input.ImeAction[] values();
     enum_constant public static final androidx.ui.input.ImeAction Done;
     enum_constant public static final androidx.ui.input.ImeAction Go;
     enum_constant public static final androidx.ui.input.ImeAction Next;
@@ -90,6 +92,8 @@
   }
 
   public enum KeyboardType {
+    method public static androidx.ui.input.KeyboardType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.input.KeyboardType[] values();
     enum_constant public static final androidx.ui.input.KeyboardType Ascii;
     enum_constant public static final androidx.ui.input.KeyboardType Email;
     enum_constant public static final androidx.ui.input.KeyboardType Number;
@@ -111,7 +115,7 @@
   public interface OffsetMap {
     method public int originalToTransformed(int offset);
     method public int transformedToOriginal(int offset);
-    field public static final androidx.ui.input.OffsetMap.Companion! Companion;
+    field public static final androidx.ui.input.OffsetMap.Companion Companion;
   }
 
   public static final class OffsetMap.Companion {
@@ -177,7 +181,7 @@
     method public androidx.ui.text.TextRange? getComposition();
     method public androidx.ui.text.TextRange getSelection();
     method public String getText();
-    field public static final androidx.ui.input.TextFieldValue.Companion! Companion;
+    field public static final androidx.ui.input.TextFieldValue.Companion Companion;
   }
 
   public static final class TextFieldValue.Companion {
@@ -219,7 +223,7 @@
 
   @androidx.compose.Immutable public interface VisualTransformation {
     method public androidx.ui.input.TransformedText filter(androidx.ui.text.AnnotatedString text);
-    field public static final androidx.ui.input.VisualTransformation.Companion! Companion;
+    field public static final androidx.ui.input.VisualTransformation.Companion Companion;
   }
 
   public static final class VisualTransformation.Companion {
@@ -243,7 +247,7 @@
     property public final String language;
     property public final String region;
     property public final String script;
-    field public static final androidx.ui.intl.Locale.Companion! Companion;
+    field public static final androidx.ui.intl.Locale.Companion Companion;
   }
 
   public static final class Locale.Companion {
@@ -265,7 +269,7 @@
     method public boolean isEmpty();
     method public java.util.Iterator<androidx.ui.intl.Locale> iterator();
     property public int size;
-    field public static final androidx.ui.intl.LocaleList.Companion! Companion;
+    field public static final androidx.ui.intl.LocaleList.Companion Companion;
   }
 
   public static final class LocaleList.Companion {
@@ -504,6 +508,8 @@
   }
 
   public enum PlaceholderVerticalAlign {
+    method public static androidx.ui.text.PlaceholderVerticalAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.PlaceholderVerticalAlign[] values();
     enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign AboveBaseline;
     enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Bottom;
     enum_constant public static final androidx.ui.text.PlaceholderVerticalAlign Center;
@@ -632,7 +638,7 @@
 
   public final class TextPainter {
     method public void paint(androidx.ui.graphics.Canvas canvas, androidx.ui.text.TextLayoutResult textLayoutResult);
-    field public static final androidx.ui.text.TextPainter! INSTANCE;
+    field public static final androidx.ui.text.TextPainter INSTANCE;
   }
 
   @androidx.compose.Immutable public final class TextRange {
@@ -655,7 +661,7 @@
     property public final int max;
     property public final int min;
     property public final boolean reversed;
-    field public static final androidx.ui.text.TextRange.Companion! Companion;
+    field public static final androidx.ui.text.TextRange.Companion Companion;
   }
 
   public static final class TextRange.Companion {
@@ -714,7 +720,7 @@
     method @androidx.compose.Stable public operator androidx.ui.text.TextStyle plus(androidx.ui.text.SpanStyle other);
     method @androidx.compose.Stable public androidx.ui.text.ParagraphStyle toParagraphStyle();
     method @androidx.compose.Stable public androidx.ui.text.SpanStyle toSpanStyle();
-    field public static final androidx.ui.text.TextStyle.Companion! Companion;
+    field public static final androidx.ui.text.TextStyle.Companion Companion;
   }
 
   public static final class TextStyle.Companion {
@@ -752,7 +758,7 @@
 
   @androidx.compose.Immutable public abstract sealed class FontFamily {
     method public final boolean getCanLoadSynchronously();
-    field public static final androidx.ui.text.font.FontFamily.Companion! Companion;
+    field public static final androidx.ui.text.font.FontFamily.Companion Companion;
   }
 
   public static final class FontFamily.Companion {
@@ -798,11 +804,15 @@
   }
 
   public enum FontStyle {
+    method public static androidx.ui.text.font.FontStyle valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.font.FontStyle[] values();
     enum_constant public static final androidx.ui.text.font.FontStyle Italic;
     enum_constant public static final androidx.ui.text.font.FontStyle Normal;
   }
 
   public enum FontSynthesis {
+    method public static androidx.ui.text.font.FontSynthesis valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.font.FontSynthesis[] values();
     enum_constant public static final androidx.ui.text.font.FontSynthesis All;
     enum_constant public static final androidx.ui.text.font.FontSynthesis None;
     enum_constant public static final androidx.ui.text.font.FontSynthesis Style;
@@ -815,7 +825,7 @@
     method public int component1();
     method @androidx.compose.Immutable public androidx.ui.text.font.FontWeight copy(int weight);
     method public int getWeight();
-    field public static final androidx.ui.text.font.FontWeight.Companion! Companion;
+    field public static final androidx.ui.text.font.FontWeight.Companion Companion;
   }
 
   public static final class FontWeight.Companion {
@@ -922,7 +932,7 @@
     method public float getMultiplier();
     method @androidx.compose.Immutable public static inline int hashCode-impl(float p);
     method @androidx.compose.Immutable public static inline String! toString-impl(float p);
-    field public static final androidx.ui.text.style.BaselineShift.Companion! Companion;
+    field public static final androidx.ui.text.style.BaselineShift.Companion Companion;
   }
 
   public static final class BaselineShift.Companion {
@@ -939,6 +949,8 @@
   }
 
   public enum TextAlign {
+    method public static androidx.ui.text.style.TextAlign valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextAlign[] values();
     enum_constant public static final androidx.ui.text.style.TextAlign Center;
     enum_constant public static final androidx.ui.text.style.TextAlign End;
     enum_constant public static final androidx.ui.text.style.TextAlign Justify;
@@ -952,7 +964,7 @@
     method public boolean contains(androidx.ui.text.style.TextDecoration other);
     method @androidx.compose.Immutable public androidx.ui.text.style.TextDecoration copy(int mask);
     method public int getMask();
-    field public static final androidx.ui.text.style.TextDecoration.Companion! Companion;
+    field public static final androidx.ui.text.style.TextDecoration.Companion Companion;
   }
 
   public static final class TextDecoration.Companion {
@@ -966,11 +978,15 @@
   }
 
   public enum TextDirection {
+    method public static androidx.ui.text.style.TextDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextDirection[] values();
     enum_constant public static final androidx.ui.text.style.TextDirection Ltr;
     enum_constant public static final androidx.ui.text.style.TextDirection Rtl;
   }
 
   public enum TextDirectionAlgorithm {
+    method public static androidx.ui.text.style.TextDirectionAlgorithm valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextDirectionAlgorithm[] values();
     enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ContentOrLtr;
     enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ContentOrRtl;
     enum_constant public static final androidx.ui.text.style.TextDirectionAlgorithm ForceLtr;
@@ -985,7 +1001,7 @@
     method @androidx.compose.Immutable public androidx.ui.text.style.TextGeometricTransform copy(float scaleX, float skewX);
     method public float getScaleX();
     method public float getSkewX();
-    field public static final androidx.ui.text.style.TextGeometricTransform.Companion! Companion;
+    field public static final androidx.ui.text.style.TextGeometricTransform.Companion Companion;
   }
 
   public static final class TextGeometricTransform.Companion {
@@ -1001,7 +1017,7 @@
     method @androidx.compose.Immutable public androidx.ui.text.style.TextIndent copy-gL_aCS0(long firstLine, long restLine);
     method public long getFirstLine();
     method public long getRestLine();
-    field public static final androidx.ui.text.style.TextIndent.Companion! Companion;
+    field public static final androidx.ui.text.style.TextIndent.Companion Companion;
   }
 
   public static final class TextIndent.Companion {
@@ -1014,6 +1030,8 @@
   }
 
   public enum TextOverflow {
+    method public static androidx.ui.text.style.TextOverflow valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.text.style.TextOverflow[] values();
     enum_constant public static final androidx.ui.text.style.TextOverflow Clip;
     enum_constant public static final androidx.ui.text.style.TextOverflow Ellipsis;
   }
diff --git a/ui/ui-text/api/0.1.0-dev15.txt b/ui/ui-text/api/0.1.0-dev15.txt
index d6f14c3..a9d41e4 100644
--- a/ui/ui-text/api/0.1.0-dev15.txt
+++ b/ui/ui-text/api/0.1.0-dev15.txt
@@ -33,7 +33,7 @@
     method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getSupportsInputMethods();
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.input.ImeAction> ImeAction;
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> SupportsInputMethods;
-    field public static final androidx.ui.text.TextSemanticsProperties! INSTANCE;
+    field public static final androidx.ui.text.TextSemanticsProperties INSTANCE;
   }
 
   public final class TextSemanticsPropertiesKt {
diff --git a/ui/ui-text/api/current.txt b/ui/ui-text/api/current.txt
index d6f14c3..a9d41e4 100644
--- a/ui/ui-text/api/current.txt
+++ b/ui/ui-text/api/current.txt
@@ -33,7 +33,7 @@
     method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getSupportsInputMethods();
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.input.ImeAction> ImeAction;
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> SupportsInputMethods;
-    field public static final androidx.ui.text.TextSemanticsProperties! INSTANCE;
+    field public static final androidx.ui.text.TextSemanticsProperties INSTANCE;
   }
 
   public final class TextSemanticsPropertiesKt {
diff --git a/ui/ui-text/api/public_plus_experimental_0.1.0-dev15.txt b/ui/ui-text/api/public_plus_experimental_0.1.0-dev15.txt
index d6f14c3..a9d41e4 100644
--- a/ui/ui-text/api/public_plus_experimental_0.1.0-dev15.txt
+++ b/ui/ui-text/api/public_plus_experimental_0.1.0-dev15.txt
@@ -33,7 +33,7 @@
     method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getSupportsInputMethods();
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.input.ImeAction> ImeAction;
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> SupportsInputMethods;
-    field public static final androidx.ui.text.TextSemanticsProperties! INSTANCE;
+    field public static final androidx.ui.text.TextSemanticsProperties INSTANCE;
   }
 
   public final class TextSemanticsPropertiesKt {
diff --git a/ui/ui-text/api/public_plus_experimental_current.txt b/ui/ui-text/api/public_plus_experimental_current.txt
index d6f14c3..a9d41e4 100644
--- a/ui/ui-text/api/public_plus_experimental_current.txt
+++ b/ui/ui-text/api/public_plus_experimental_current.txt
@@ -33,7 +33,7 @@
     method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getSupportsInputMethods();
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.input.ImeAction> ImeAction;
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> SupportsInputMethods;
-    field public static final androidx.ui.text.TextSemanticsProperties! INSTANCE;
+    field public static final androidx.ui.text.TextSemanticsProperties INSTANCE;
   }
 
   public final class TextSemanticsPropertiesKt {
diff --git a/ui/ui-text/api/restricted_0.1.0-dev15.txt b/ui/ui-text/api/restricted_0.1.0-dev15.txt
index d6f14c3..a9d41e4 100644
--- a/ui/ui-text/api/restricted_0.1.0-dev15.txt
+++ b/ui/ui-text/api/restricted_0.1.0-dev15.txt
@@ -33,7 +33,7 @@
     method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getSupportsInputMethods();
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.input.ImeAction> ImeAction;
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> SupportsInputMethods;
-    field public static final androidx.ui.text.TextSemanticsProperties! INSTANCE;
+    field public static final androidx.ui.text.TextSemanticsProperties INSTANCE;
   }
 
   public final class TextSemanticsPropertiesKt {
diff --git a/ui/ui-text/api/restricted_current.txt b/ui/ui-text/api/restricted_current.txt
index d6f14c3..a9d41e4 100644
--- a/ui/ui-text/api/restricted_current.txt
+++ b/ui/ui-text/api/restricted_current.txt
@@ -33,7 +33,7 @@
     method public androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> getSupportsInputMethods();
     property public final androidx.ui.semantics.SemanticsPropertyKey<androidx.ui.input.ImeAction> ImeAction;
     property public final androidx.ui.semantics.SemanticsPropertyKey<java.lang.Boolean> SupportsInputMethods;
-    field public static final androidx.ui.text.TextSemanticsProperties! INSTANCE;
+    field public static final androidx.ui.text.TextSemanticsProperties INSTANCE;
   }
 
   public final class TextSemanticsPropertiesKt {
diff --git a/ui/ui-unit/api/0.1.0-dev15.txt b/ui/ui-unit/api/0.1.0-dev15.txt
index 08c7a60..1f0e0c3 100644
--- a/ui/ui-unit/api/0.1.0-dev15.txt
+++ b/ui/ui-unit/api/0.1.0-dev15.txt
@@ -17,7 +17,7 @@
     property public final int maxWidth;
     property public final int minHeight;
     property public final int minWidth;
-    field public static final androidx.ui.core.Constraints.Companion! Companion;
+    field public static final androidx.ui.core.Constraints.Companion Companion;
     field public static final int Infinity = 2147483647; // 0x7fffffff
   }
 
@@ -41,6 +41,8 @@
   }
 
   public enum LayoutDirection {
+    method public static androidx.ui.core.LayoutDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.LayoutDirection[] values();
     enum_constant public static final androidx.ui.core.LayoutDirection Ltr;
     enum_constant public static final androidx.ui.core.LayoutDirection Rtl;
   }
@@ -108,7 +110,7 @@
     method @androidx.compose.Stable public static inline operator float times-x8crYZs(float $this, float other);
     method @androidx.compose.Stable public static String toString-impl(float $this);
     method @androidx.compose.Stable public static inline operator float unaryMinus-impl(float $this);
-    field public static final androidx.ui.unit.Dp.Companion! Companion;
+    field public static final androidx.ui.unit.Dp.Companion Companion;
   }
 
   public static final class Dp.Companion {
@@ -214,7 +216,7 @@
     method @androidx.compose.Stable public operator androidx.ui.unit.Duration plus(androidx.ui.unit.Duration other);
     method @androidx.compose.Stable public operator androidx.ui.unit.Duration times(int factor);
     method @androidx.compose.Stable public operator androidx.ui.unit.Duration times(double factor);
-    field public static final androidx.ui.unit.Duration.Companion! Companion;
+    field public static final androidx.ui.unit.Duration.Companion Companion;
   }
 
   public static final class Duration.Companion {
@@ -268,7 +270,7 @@
     method @androidx.compose.Stable public inline operator androidx.ui.unit.IntOffset unaryMinus();
     property public final int x;
     property public final int y;
-    field public static final androidx.ui.unit.IntOffset.Companion! Companion;
+    field public static final androidx.ui.unit.IntOffset.Companion Companion;
   }
 
   public static final class IntOffset.Companion {
@@ -296,7 +298,7 @@
     method @androidx.compose.Stable public operator androidx.ui.unit.IntSize times(int other);
     property public final int height;
     property public final int width;
-    field public static final androidx.ui.unit.IntSize.Companion! Companion;
+    field public static final androidx.ui.unit.IntSize.Companion Companion;
   }
 
   public static final class IntSize.Companion {
@@ -425,7 +427,7 @@
     method public static inline operator long times-impl(long $this, int other);
     method public static String toString-impl(long $this);
     method public static inline operator long unaryMinus-impl(long $this);
-    field public static final androidx.ui.unit.TextUnit.Companion! Companion;
+    field public static final androidx.ui.unit.TextUnit.Companion Companion;
   }
 
   public static final class TextUnit.Companion {
@@ -458,6 +460,8 @@
   }
 
   public enum TextUnitType {
+    method public static androidx.ui.unit.TextUnitType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.unit.TextUnitType[] values();
     enum_constant public static final androidx.ui.unit.TextUnitType Em;
     enum_constant public static final androidx.ui.unit.TextUnitType Inherit;
     enum_constant public static final androidx.ui.unit.TextUnitType Sp;
@@ -472,7 +476,7 @@
     method public operator androidx.ui.unit.Uptime minus(androidx.ui.unit.Duration duration);
     method public operator androidx.ui.unit.Duration minus(androidx.ui.unit.Uptime other);
     method public operator androidx.ui.unit.Uptime plus(androidx.ui.unit.Duration duration);
-    field public static final androidx.ui.unit.Uptime.Companion! Companion;
+    field public static final androidx.ui.unit.Uptime.Companion Companion;
   }
 
   public static final class Uptime.Companion {
@@ -490,7 +494,7 @@
     method @androidx.compose.Immutable public androidx.ui.unit.Velocity copy(androidx.ui.geometry.Offset pixelsPerSecond);
     method public androidx.ui.geometry.Offset getPixelsPerSecond();
     method public operator androidx.ui.unit.Velocity unaryMinus();
-    field public static final androidx.ui.unit.Velocity.Companion! Companion;
+    field public static final androidx.ui.unit.Velocity.Companion Companion;
   }
 
   public static final class Velocity.Companion {
diff --git a/ui/ui-unit/api/api_lint.ignore b/ui/ui-unit/api/api_lint.ignore
index aad744b..319f1ff 100644
--- a/ui/ui-unit/api/api_lint.ignore
+++ b/ui/ui-unit/api/api_lint.ignore
@@ -1,7 +1,3 @@
 // Baseline format: 1.0
 MethodNameUnits: androidx.ui.unit.Durations#inSeconds(androidx.ui.unit.Duration):
     Returned time values must be in milliseconds, was `inSeconds`
-
-
-MissingNullability: androidx.ui.core.Constraints2#toString-impl(long):
-    Missing nullability on method `toString-impl` return
diff --git a/ui/ui-unit/api/current.txt b/ui/ui-unit/api/current.txt
index 08c7a60..1f0e0c3 100644
--- a/ui/ui-unit/api/current.txt
+++ b/ui/ui-unit/api/current.txt
@@ -17,7 +17,7 @@
     property public final int maxWidth;
     property public final int minHeight;
     property public final int minWidth;
-    field public static final androidx.ui.core.Constraints.Companion! Companion;
+    field public static final androidx.ui.core.Constraints.Companion Companion;
     field public static final int Infinity = 2147483647; // 0x7fffffff
   }
 
@@ -41,6 +41,8 @@
   }
 
   public enum LayoutDirection {
+    method public static androidx.ui.core.LayoutDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.LayoutDirection[] values();
     enum_constant public static final androidx.ui.core.LayoutDirection Ltr;
     enum_constant public static final androidx.ui.core.LayoutDirection Rtl;
   }
@@ -108,7 +110,7 @@
     method @androidx.compose.Stable public static inline operator float times-x8crYZs(float $this, float other);
     method @androidx.compose.Stable public static String toString-impl(float $this);
     method @androidx.compose.Stable public static inline operator float unaryMinus-impl(float $this);
-    field public static final androidx.ui.unit.Dp.Companion! Companion;
+    field public static final androidx.ui.unit.Dp.Companion Companion;
   }
 
   public static final class Dp.Companion {
@@ -214,7 +216,7 @@
     method @androidx.compose.Stable public operator androidx.ui.unit.Duration plus(androidx.ui.unit.Duration other);
     method @androidx.compose.Stable public operator androidx.ui.unit.Duration times(int factor);
     method @androidx.compose.Stable public operator androidx.ui.unit.Duration times(double factor);
-    field public static final androidx.ui.unit.Duration.Companion! Companion;
+    field public static final androidx.ui.unit.Duration.Companion Companion;
   }
 
   public static final class Duration.Companion {
@@ -268,7 +270,7 @@
     method @androidx.compose.Stable public inline operator androidx.ui.unit.IntOffset unaryMinus();
     property public final int x;
     property public final int y;
-    field public static final androidx.ui.unit.IntOffset.Companion! Companion;
+    field public static final androidx.ui.unit.IntOffset.Companion Companion;
   }
 
   public static final class IntOffset.Companion {
@@ -296,7 +298,7 @@
     method @androidx.compose.Stable public operator androidx.ui.unit.IntSize times(int other);
     property public final int height;
     property public final int width;
-    field public static final androidx.ui.unit.IntSize.Companion! Companion;
+    field public static final androidx.ui.unit.IntSize.Companion Companion;
   }
 
   public static final class IntSize.Companion {
@@ -425,7 +427,7 @@
     method public static inline operator long times-impl(long $this, int other);
     method public static String toString-impl(long $this);
     method public static inline operator long unaryMinus-impl(long $this);
-    field public static final androidx.ui.unit.TextUnit.Companion! Companion;
+    field public static final androidx.ui.unit.TextUnit.Companion Companion;
   }
 
   public static final class TextUnit.Companion {
@@ -458,6 +460,8 @@
   }
 
   public enum TextUnitType {
+    method public static androidx.ui.unit.TextUnitType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.unit.TextUnitType[] values();
     enum_constant public static final androidx.ui.unit.TextUnitType Em;
     enum_constant public static final androidx.ui.unit.TextUnitType Inherit;
     enum_constant public static final androidx.ui.unit.TextUnitType Sp;
@@ -472,7 +476,7 @@
     method public operator androidx.ui.unit.Uptime minus(androidx.ui.unit.Duration duration);
     method public operator androidx.ui.unit.Duration minus(androidx.ui.unit.Uptime other);
     method public operator androidx.ui.unit.Uptime plus(androidx.ui.unit.Duration duration);
-    field public static final androidx.ui.unit.Uptime.Companion! Companion;
+    field public static final androidx.ui.unit.Uptime.Companion Companion;
   }
 
   public static final class Uptime.Companion {
@@ -490,7 +494,7 @@
     method @androidx.compose.Immutable public androidx.ui.unit.Velocity copy(androidx.ui.geometry.Offset pixelsPerSecond);
     method public androidx.ui.geometry.Offset getPixelsPerSecond();
     method public operator androidx.ui.unit.Velocity unaryMinus();
-    field public static final androidx.ui.unit.Velocity.Companion! Companion;
+    field public static final androidx.ui.unit.Velocity.Companion Companion;
   }
 
   public static final class Velocity.Companion {
diff --git a/ui/ui-unit/api/public_plus_experimental_0.1.0-dev15.txt b/ui/ui-unit/api/public_plus_experimental_0.1.0-dev15.txt
index 08c7a60..1f0e0c3 100644
--- a/ui/ui-unit/api/public_plus_experimental_0.1.0-dev15.txt
+++ b/ui/ui-unit/api/public_plus_experimental_0.1.0-dev15.txt
@@ -17,7 +17,7 @@
     property public final int maxWidth;
     property public final int minHeight;
     property public final int minWidth;
-    field public static final androidx.ui.core.Constraints.Companion! Companion;
+    field public static final androidx.ui.core.Constraints.Companion Companion;
     field public static final int Infinity = 2147483647; // 0x7fffffff
   }
 
@@ -41,6 +41,8 @@
   }
 
   public enum LayoutDirection {
+    method public static androidx.ui.core.LayoutDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.LayoutDirection[] values();
     enum_constant public static final androidx.ui.core.LayoutDirection Ltr;
     enum_constant public static final androidx.ui.core.LayoutDirection Rtl;
   }
@@ -108,7 +110,7 @@
     method @androidx.compose.Stable public static inline operator float times-x8crYZs(float $this, float other);
     method @androidx.compose.Stable public static String toString-impl(float $this);
     method @androidx.compose.Stable public static inline operator float unaryMinus-impl(float $this);
-    field public static final androidx.ui.unit.Dp.Companion! Companion;
+    field public static final androidx.ui.unit.Dp.Companion Companion;
   }
 
   public static final class Dp.Companion {
@@ -214,7 +216,7 @@
     method @androidx.compose.Stable public operator androidx.ui.unit.Duration plus(androidx.ui.unit.Duration other);
     method @androidx.compose.Stable public operator androidx.ui.unit.Duration times(int factor);
     method @androidx.compose.Stable public operator androidx.ui.unit.Duration times(double factor);
-    field public static final androidx.ui.unit.Duration.Companion! Companion;
+    field public static final androidx.ui.unit.Duration.Companion Companion;
   }
 
   public static final class Duration.Companion {
@@ -268,7 +270,7 @@
     method @androidx.compose.Stable public inline operator androidx.ui.unit.IntOffset unaryMinus();
     property public final int x;
     property public final int y;
-    field public static final androidx.ui.unit.IntOffset.Companion! Companion;
+    field public static final androidx.ui.unit.IntOffset.Companion Companion;
   }
 
   public static final class IntOffset.Companion {
@@ -296,7 +298,7 @@
     method @androidx.compose.Stable public operator androidx.ui.unit.IntSize times(int other);
     property public final int height;
     property public final int width;
-    field public static final androidx.ui.unit.IntSize.Companion! Companion;
+    field public static final androidx.ui.unit.IntSize.Companion Companion;
   }
 
   public static final class IntSize.Companion {
@@ -425,7 +427,7 @@
     method public static inline operator long times-impl(long $this, int other);
     method public static String toString-impl(long $this);
     method public static inline operator long unaryMinus-impl(long $this);
-    field public static final androidx.ui.unit.TextUnit.Companion! Companion;
+    field public static final androidx.ui.unit.TextUnit.Companion Companion;
   }
 
   public static final class TextUnit.Companion {
@@ -458,6 +460,8 @@
   }
 
   public enum TextUnitType {
+    method public static androidx.ui.unit.TextUnitType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.unit.TextUnitType[] values();
     enum_constant public static final androidx.ui.unit.TextUnitType Em;
     enum_constant public static final androidx.ui.unit.TextUnitType Inherit;
     enum_constant public static final androidx.ui.unit.TextUnitType Sp;
@@ -472,7 +476,7 @@
     method public operator androidx.ui.unit.Uptime minus(androidx.ui.unit.Duration duration);
     method public operator androidx.ui.unit.Duration minus(androidx.ui.unit.Uptime other);
     method public operator androidx.ui.unit.Uptime plus(androidx.ui.unit.Duration duration);
-    field public static final androidx.ui.unit.Uptime.Companion! Companion;
+    field public static final androidx.ui.unit.Uptime.Companion Companion;
   }
 
   public static final class Uptime.Companion {
@@ -490,7 +494,7 @@
     method @androidx.compose.Immutable public androidx.ui.unit.Velocity copy(androidx.ui.geometry.Offset pixelsPerSecond);
     method public androidx.ui.geometry.Offset getPixelsPerSecond();
     method public operator androidx.ui.unit.Velocity unaryMinus();
-    field public static final androidx.ui.unit.Velocity.Companion! Companion;
+    field public static final androidx.ui.unit.Velocity.Companion Companion;
   }
 
   public static final class Velocity.Companion {
diff --git a/ui/ui-unit/api/public_plus_experimental_current.txt b/ui/ui-unit/api/public_plus_experimental_current.txt
index 08c7a60..1f0e0c3 100644
--- a/ui/ui-unit/api/public_plus_experimental_current.txt
+++ b/ui/ui-unit/api/public_plus_experimental_current.txt
@@ -17,7 +17,7 @@
     property public final int maxWidth;
     property public final int minHeight;
     property public final int minWidth;
-    field public static final androidx.ui.core.Constraints.Companion! Companion;
+    field public static final androidx.ui.core.Constraints.Companion Companion;
     field public static final int Infinity = 2147483647; // 0x7fffffff
   }
 
@@ -41,6 +41,8 @@
   }
 
   public enum LayoutDirection {
+    method public static androidx.ui.core.LayoutDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.LayoutDirection[] values();
     enum_constant public static final androidx.ui.core.LayoutDirection Ltr;
     enum_constant public static final androidx.ui.core.LayoutDirection Rtl;
   }
@@ -108,7 +110,7 @@
     method @androidx.compose.Stable public static inline operator float times-x8crYZs(float $this, float other);
     method @androidx.compose.Stable public static String toString-impl(float $this);
     method @androidx.compose.Stable public static inline operator float unaryMinus-impl(float $this);
-    field public static final androidx.ui.unit.Dp.Companion! Companion;
+    field public static final androidx.ui.unit.Dp.Companion Companion;
   }
 
   public static final class Dp.Companion {
@@ -214,7 +216,7 @@
     method @androidx.compose.Stable public operator androidx.ui.unit.Duration plus(androidx.ui.unit.Duration other);
     method @androidx.compose.Stable public operator androidx.ui.unit.Duration times(int factor);
     method @androidx.compose.Stable public operator androidx.ui.unit.Duration times(double factor);
-    field public static final androidx.ui.unit.Duration.Companion! Companion;
+    field public static final androidx.ui.unit.Duration.Companion Companion;
   }
 
   public static final class Duration.Companion {
@@ -268,7 +270,7 @@
     method @androidx.compose.Stable public inline operator androidx.ui.unit.IntOffset unaryMinus();
     property public final int x;
     property public final int y;
-    field public static final androidx.ui.unit.IntOffset.Companion! Companion;
+    field public static final androidx.ui.unit.IntOffset.Companion Companion;
   }
 
   public static final class IntOffset.Companion {
@@ -296,7 +298,7 @@
     method @androidx.compose.Stable public operator androidx.ui.unit.IntSize times(int other);
     property public final int height;
     property public final int width;
-    field public static final androidx.ui.unit.IntSize.Companion! Companion;
+    field public static final androidx.ui.unit.IntSize.Companion Companion;
   }
 
   public static final class IntSize.Companion {
@@ -425,7 +427,7 @@
     method public static inline operator long times-impl(long $this, int other);
     method public static String toString-impl(long $this);
     method public static inline operator long unaryMinus-impl(long $this);
-    field public static final androidx.ui.unit.TextUnit.Companion! Companion;
+    field public static final androidx.ui.unit.TextUnit.Companion Companion;
   }
 
   public static final class TextUnit.Companion {
@@ -458,6 +460,8 @@
   }
 
   public enum TextUnitType {
+    method public static androidx.ui.unit.TextUnitType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.unit.TextUnitType[] values();
     enum_constant public static final androidx.ui.unit.TextUnitType Em;
     enum_constant public static final androidx.ui.unit.TextUnitType Inherit;
     enum_constant public static final androidx.ui.unit.TextUnitType Sp;
@@ -472,7 +476,7 @@
     method public operator androidx.ui.unit.Uptime minus(androidx.ui.unit.Duration duration);
     method public operator androidx.ui.unit.Duration minus(androidx.ui.unit.Uptime other);
     method public operator androidx.ui.unit.Uptime plus(androidx.ui.unit.Duration duration);
-    field public static final androidx.ui.unit.Uptime.Companion! Companion;
+    field public static final androidx.ui.unit.Uptime.Companion Companion;
   }
 
   public static final class Uptime.Companion {
@@ -490,7 +494,7 @@
     method @androidx.compose.Immutable public androidx.ui.unit.Velocity copy(androidx.ui.geometry.Offset pixelsPerSecond);
     method public androidx.ui.geometry.Offset getPixelsPerSecond();
     method public operator androidx.ui.unit.Velocity unaryMinus();
-    field public static final androidx.ui.unit.Velocity.Companion! Companion;
+    field public static final androidx.ui.unit.Velocity.Companion Companion;
   }
 
   public static final class Velocity.Companion {
diff --git a/ui/ui-unit/api/restricted_0.1.0-dev15.txt b/ui/ui-unit/api/restricted_0.1.0-dev15.txt
index 82aef00..29c348b 100644
--- a/ui/ui-unit/api/restricted_0.1.0-dev15.txt
+++ b/ui/ui-unit/api/restricted_0.1.0-dev15.txt
@@ -17,7 +17,7 @@
     property public final int maxWidth;
     property public final int minHeight;
     property public final int minWidth;
-    field public static final androidx.ui.core.Constraints.Companion! Companion;
+    field public static final androidx.ui.core.Constraints.Companion Companion;
     field public static final int Infinity = 2147483647; // 0x7fffffff
   }
 
@@ -41,6 +41,8 @@
   }
 
   public enum LayoutDirection {
+    method public static androidx.ui.core.LayoutDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.LayoutDirection[] values();
     enum_constant public static final androidx.ui.core.LayoutDirection Ltr;
     enum_constant public static final androidx.ui.core.LayoutDirection Rtl;
   }
@@ -108,7 +110,7 @@
     method @androidx.compose.Stable public static inline operator float times-x8crYZs(float $this, float other);
     method @androidx.compose.Stable public static String toString-impl(float $this);
     method @androidx.compose.Stable public static inline operator float unaryMinus-impl(float $this);
-    field public static final androidx.ui.unit.Dp.Companion! Companion;
+    field public static final androidx.ui.unit.Dp.Companion Companion;
   }
 
   public static final class Dp.Companion {
@@ -214,7 +216,7 @@
     method @androidx.compose.Stable public operator androidx.ui.unit.Duration plus(androidx.ui.unit.Duration other);
     method @androidx.compose.Stable public operator androidx.ui.unit.Duration times(int factor);
     method @androidx.compose.Stable public operator androidx.ui.unit.Duration times(double factor);
-    field public static final androidx.ui.unit.Duration.Companion! Companion;
+    field public static final androidx.ui.unit.Duration.Companion Companion;
   }
 
   public static final class Duration.Companion {
@@ -268,7 +270,7 @@
     method @androidx.compose.Stable public inline operator androidx.ui.unit.IntOffset unaryMinus();
     property public final int x;
     property public final int y;
-    field public static final androidx.ui.unit.IntOffset.Companion! Companion;
+    field public static final androidx.ui.unit.IntOffset.Companion Companion;
   }
 
   public static final class IntOffset.Companion {
@@ -296,7 +298,7 @@
     method @androidx.compose.Stable public operator androidx.ui.unit.IntSize times(int other);
     property public final int height;
     property public final int width;
-    field public static final androidx.ui.unit.IntSize.Companion! Companion;
+    field public static final androidx.ui.unit.IntSize.Companion Companion;
   }
 
   public static final class IntSize.Companion {
@@ -425,7 +427,7 @@
     method public static inline operator long times-impl(long $this, int other);
     method public static String toString-impl(long $this);
     method public static inline operator long unaryMinus-impl(long $this);
-    field public static final androidx.ui.unit.TextUnit.Companion! Companion;
+    field public static final androidx.ui.unit.TextUnit.Companion Companion;
   }
 
   public static final class TextUnit.Companion {
@@ -462,6 +464,8 @@
   }
 
   public enum TextUnitType {
+    method public static androidx.ui.unit.TextUnitType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.unit.TextUnitType[] values();
     enum_constant public static final androidx.ui.unit.TextUnitType Em;
     enum_constant public static final androidx.ui.unit.TextUnitType Inherit;
     enum_constant public static final androidx.ui.unit.TextUnitType Sp;
@@ -476,7 +480,7 @@
     method public operator androidx.ui.unit.Uptime minus(androidx.ui.unit.Duration duration);
     method public operator androidx.ui.unit.Duration minus(androidx.ui.unit.Uptime other);
     method public operator androidx.ui.unit.Uptime plus(androidx.ui.unit.Duration duration);
-    field public static final androidx.ui.unit.Uptime.Companion! Companion;
+    field public static final androidx.ui.unit.Uptime.Companion Companion;
   }
 
   public static final class Uptime.Companion {
@@ -494,7 +498,7 @@
     method @androidx.compose.Immutable public androidx.ui.unit.Velocity copy(androidx.ui.geometry.Offset pixelsPerSecond);
     method public androidx.ui.geometry.Offset getPixelsPerSecond();
     method public operator androidx.ui.unit.Velocity unaryMinus();
-    field public static final androidx.ui.unit.Velocity.Companion! Companion;
+    field public static final androidx.ui.unit.Velocity.Companion Companion;
   }
 
   public static final class Velocity.Companion {
diff --git a/ui/ui-unit/api/restricted_current.txt b/ui/ui-unit/api/restricted_current.txt
index 82aef00..29c348b 100644
--- a/ui/ui-unit/api/restricted_current.txt
+++ b/ui/ui-unit/api/restricted_current.txt
@@ -17,7 +17,7 @@
     property public final int maxWidth;
     property public final int minHeight;
     property public final int minWidth;
-    field public static final androidx.ui.core.Constraints.Companion! Companion;
+    field public static final androidx.ui.core.Constraints.Companion Companion;
     field public static final int Infinity = 2147483647; // 0x7fffffff
   }
 
@@ -41,6 +41,8 @@
   }
 
   public enum LayoutDirection {
+    method public static androidx.ui.core.LayoutDirection valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.core.LayoutDirection[] values();
     enum_constant public static final androidx.ui.core.LayoutDirection Ltr;
     enum_constant public static final androidx.ui.core.LayoutDirection Rtl;
   }
@@ -108,7 +110,7 @@
     method @androidx.compose.Stable public static inline operator float times-x8crYZs(float $this, float other);
     method @androidx.compose.Stable public static String toString-impl(float $this);
     method @androidx.compose.Stable public static inline operator float unaryMinus-impl(float $this);
-    field public static final androidx.ui.unit.Dp.Companion! Companion;
+    field public static final androidx.ui.unit.Dp.Companion Companion;
   }
 
   public static final class Dp.Companion {
@@ -214,7 +216,7 @@
     method @androidx.compose.Stable public operator androidx.ui.unit.Duration plus(androidx.ui.unit.Duration other);
     method @androidx.compose.Stable public operator androidx.ui.unit.Duration times(int factor);
     method @androidx.compose.Stable public operator androidx.ui.unit.Duration times(double factor);
-    field public static final androidx.ui.unit.Duration.Companion! Companion;
+    field public static final androidx.ui.unit.Duration.Companion Companion;
   }
 
   public static final class Duration.Companion {
@@ -268,7 +270,7 @@
     method @androidx.compose.Stable public inline operator androidx.ui.unit.IntOffset unaryMinus();
     property public final int x;
     property public final int y;
-    field public static final androidx.ui.unit.IntOffset.Companion! Companion;
+    field public static final androidx.ui.unit.IntOffset.Companion Companion;
   }
 
   public static final class IntOffset.Companion {
@@ -296,7 +298,7 @@
     method @androidx.compose.Stable public operator androidx.ui.unit.IntSize times(int other);
     property public final int height;
     property public final int width;
-    field public static final androidx.ui.unit.IntSize.Companion! Companion;
+    field public static final androidx.ui.unit.IntSize.Companion Companion;
   }
 
   public static final class IntSize.Companion {
@@ -425,7 +427,7 @@
     method public static inline operator long times-impl(long $this, int other);
     method public static String toString-impl(long $this);
     method public static inline operator long unaryMinus-impl(long $this);
-    field public static final androidx.ui.unit.TextUnit.Companion! Companion;
+    field public static final androidx.ui.unit.TextUnit.Companion Companion;
   }
 
   public static final class TextUnit.Companion {
@@ -462,6 +464,8 @@
   }
 
   public enum TextUnitType {
+    method public static androidx.ui.unit.TextUnitType valueOf(String name) throws java.lang.IllegalArgumentException;
+    method public static androidx.ui.unit.TextUnitType[] values();
     enum_constant public static final androidx.ui.unit.TextUnitType Em;
     enum_constant public static final androidx.ui.unit.TextUnitType Inherit;
     enum_constant public static final androidx.ui.unit.TextUnitType Sp;
@@ -476,7 +480,7 @@
     method public operator androidx.ui.unit.Uptime minus(androidx.ui.unit.Duration duration);
     method public operator androidx.ui.unit.Duration minus(androidx.ui.unit.Uptime other);
     method public operator androidx.ui.unit.Uptime plus(androidx.ui.unit.Duration duration);
-    field public static final androidx.ui.unit.Uptime.Companion! Companion;
+    field public static final androidx.ui.unit.Uptime.Companion Companion;
   }
 
   public static final class Uptime.Companion {
@@ -494,7 +498,7 @@
     method @androidx.compose.Immutable public androidx.ui.unit.Velocity copy(androidx.ui.geometry.Offset pixelsPerSecond);
     method public androidx.ui.geometry.Offset getPixelsPerSecond();
     method public operator androidx.ui.unit.Velocity unaryMinus();
-    field public static final androidx.ui.unit.Velocity.Companion! Companion;
+    field public static final androidx.ui.unit.Velocity.Companion Companion;
   }
 
   public static final class Velocity.Companion {
diff --git a/vectordrawable/vectordrawable-animated/api/api_lint.ignore b/vectordrawable/vectordrawable-animated/api/api_lint.ignore
index 8bbfad4..ffd0fdf 100644
--- a/vectordrawable/vectordrawable-animated/api/api_lint.ignore
+++ b/vectordrawable/vectordrawable-animated/api/api_lint.ignore
@@ -59,7 +59,3 @@
     Missing nullability on parameter `dr` in method `unregisterAnimationCallback`
 MissingNullability: androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat#unregisterAnimationCallback(android.graphics.drawable.Drawable, androidx.vectordrawable.graphics.drawable.Animatable2Compat.AnimationCallback) parameter #1:
     Missing nullability on parameter `callback` in method `unregisterAnimationCallback`
-
-
-NotCloseable: androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat:
-    Classes that release resources (stop()) should implement AutoClosable and CloseGuard: class androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat
diff --git a/work/workmanager/api/2.4.0-rc01.txt b/work/workmanager/api/2.4.0-rc01.txt
index 25adbb9..6c0ce36 100644
--- a/work/workmanager/api/2.4.0-rc01.txt
+++ b/work/workmanager/api/2.4.0-rc01.txt
@@ -46,7 +46,7 @@
     method public boolean requiresCharging();
     method @RequiresApi(23) public boolean requiresDeviceIdle();
     method public boolean requiresStorageNotLow();
-    field public static final androidx.work.Constraints! NONE;
+    field public static final androidx.work.Constraints NONE;
   }
 
   public static final class Constraints.Builder {
@@ -84,7 +84,7 @@
     method public String![]? getStringArray(String);
     method public <T> boolean hasKeyWithValueOfType(String, Class<T!>);
     method public byte[] toByteArray();
-    field public static final androidx.work.Data! EMPTY;
+    field public static final androidx.work.Data EMPTY;
     field public static final int MAX_DATA_BYTES = 10240; // 0x2800
   }
 
diff --git a/work/workmanager/api/api_lint.ignore b/work/workmanager/api/api_lint.ignore
index 444e9d1..8454552 100644
--- a/work/workmanager/api/api_lint.ignore
+++ b/work/workmanager/api/api_lint.ignore
@@ -45,14 +45,10 @@
     Builder methods names should use setFoo() / addFoo() / clearFoo() style: method androidx.work.WorkRequest.Builder.keepResultsForAtLeast(long,java.util.concurrent.TimeUnit)
 
 
-MissingNullability: androidx.work.Constraints#NONE:
-    Missing nullability on field `NONE` in class `class androidx.work.Constraints`
 MissingNullability: androidx.work.Constraints.Builder#setTriggerContentMaxDelay(java.time.Duration) parameter #0:
     Missing nullability on parameter `duration` in method `setTriggerContentMaxDelay`
 MissingNullability: androidx.work.Constraints.Builder#setTriggerContentUpdateDelay(java.time.Duration) parameter #0:
     Missing nullability on parameter `duration` in method `setTriggerContentUpdateDelay`
-MissingNullability: androidx.work.Data#EMPTY:
-    Missing nullability on field `EMPTY` in class `class androidx.work.Data`
 
 
 NoByteOrShort: androidx.work.Data#getByte(String, byte):
@@ -61,19 +57,3 @@
     Should avoid odd sized primitives; use `int` instead of `byte` in parameter defaultValue in androidx.work.Data.getByte(String key, byte defaultValue)
 NoByteOrShort: androidx.work.Data.Builder#putByte(String, byte) parameter #1:
     Should avoid odd sized primitives; use `int` instead of `byte` in parameter value in androidx.work.Data.Builder.putByte(String key, byte value)
-
-
-SetterReturnsThis: androidx.work.WorkRequest.Builder#addTag(String):
-    Methods must return the builder object (return type androidx.work.WorkRequest.Builder<B,W> instead of B): method androidx.work.WorkRequest.Builder.addTag(String)
-SetterReturnsThis: androidx.work.WorkRequest.Builder#setBackoffCriteria(androidx.work.BackoffPolicy, java.time.Duration):
-    Methods must return the builder object (return type androidx.work.WorkRequest.Builder<B,W> instead of B): method androidx.work.WorkRequest.Builder.setBackoffCriteria(androidx.work.BackoffPolicy,java.time.Duration)
-SetterReturnsThis: androidx.work.WorkRequest.Builder#setBackoffCriteria(androidx.work.BackoffPolicy, long, java.util.concurrent.TimeUnit):
-    Methods must return the builder object (return type androidx.work.WorkRequest.Builder<B,W> instead of B): method androidx.work.WorkRequest.Builder.setBackoffCriteria(androidx.work.BackoffPolicy,long,java.util.concurrent.TimeUnit)
-SetterReturnsThis: androidx.work.WorkRequest.Builder#setConstraints(androidx.work.Constraints):
-    Methods must return the builder object (return type androidx.work.WorkRequest.Builder<B,W> instead of B): method androidx.work.WorkRequest.Builder.setConstraints(androidx.work.Constraints)
-SetterReturnsThis: androidx.work.WorkRequest.Builder#setInitialDelay(java.time.Duration):
-    Methods must return the builder object (return type androidx.work.WorkRequest.Builder<B,W> instead of B): method androidx.work.WorkRequest.Builder.setInitialDelay(java.time.Duration)
-SetterReturnsThis: androidx.work.WorkRequest.Builder#setInitialDelay(long, java.util.concurrent.TimeUnit):
-    Methods must return the builder object (return type androidx.work.WorkRequest.Builder<B,W> instead of B): method androidx.work.WorkRequest.Builder.setInitialDelay(long,java.util.concurrent.TimeUnit)
-SetterReturnsThis: androidx.work.WorkRequest.Builder#setInputData(androidx.work.Data):
-    Methods must return the builder object (return type androidx.work.WorkRequest.Builder<B,W> instead of B): method androidx.work.WorkRequest.Builder.setInputData(androidx.work.Data)
diff --git a/work/workmanager/api/current.txt b/work/workmanager/api/current.txt
index 25adbb9..6c0ce36 100644
--- a/work/workmanager/api/current.txt
+++ b/work/workmanager/api/current.txt
@@ -46,7 +46,7 @@
     method public boolean requiresCharging();
     method @RequiresApi(23) public boolean requiresDeviceIdle();
     method public boolean requiresStorageNotLow();
-    field public static final androidx.work.Constraints! NONE;
+    field public static final androidx.work.Constraints NONE;
   }
 
   public static final class Constraints.Builder {
@@ -84,7 +84,7 @@
     method public String![]? getStringArray(String);
     method public <T> boolean hasKeyWithValueOfType(String, Class<T!>);
     method public byte[] toByteArray();
-    field public static final androidx.work.Data! EMPTY;
+    field public static final androidx.work.Data EMPTY;
     field public static final int MAX_DATA_BYTES = 10240; // 0x2800
   }
 
diff --git a/work/workmanager/api/public_plus_experimental_2.4.0-rc01.txt b/work/workmanager/api/public_plus_experimental_2.4.0-rc01.txt
index 25adbb9..6c0ce36 100644
--- a/work/workmanager/api/public_plus_experimental_2.4.0-rc01.txt
+++ b/work/workmanager/api/public_plus_experimental_2.4.0-rc01.txt
@@ -46,7 +46,7 @@
     method public boolean requiresCharging();
     method @RequiresApi(23) public boolean requiresDeviceIdle();
     method public boolean requiresStorageNotLow();
-    field public static final androidx.work.Constraints! NONE;
+    field public static final androidx.work.Constraints NONE;
   }
 
   public static final class Constraints.Builder {
@@ -84,7 +84,7 @@
     method public String![]? getStringArray(String);
     method public <T> boolean hasKeyWithValueOfType(String, Class<T!>);
     method public byte[] toByteArray();
-    field public static final androidx.work.Data! EMPTY;
+    field public static final androidx.work.Data EMPTY;
     field public static final int MAX_DATA_BYTES = 10240; // 0x2800
   }
 
diff --git a/work/workmanager/api/public_plus_experimental_current.txt b/work/workmanager/api/public_plus_experimental_current.txt
index 25adbb9..6c0ce36 100644
--- a/work/workmanager/api/public_plus_experimental_current.txt
+++ b/work/workmanager/api/public_plus_experimental_current.txt
@@ -46,7 +46,7 @@
     method public boolean requiresCharging();
     method @RequiresApi(23) public boolean requiresDeviceIdle();
     method public boolean requiresStorageNotLow();
-    field public static final androidx.work.Constraints! NONE;
+    field public static final androidx.work.Constraints NONE;
   }
 
   public static final class Constraints.Builder {
@@ -84,7 +84,7 @@
     method public String![]? getStringArray(String);
     method public <T> boolean hasKeyWithValueOfType(String, Class<T!>);
     method public byte[] toByteArray();
-    field public static final androidx.work.Data! EMPTY;
+    field public static final androidx.work.Data EMPTY;
     field public static final int MAX_DATA_BYTES = 10240; // 0x2800
   }
 
diff --git a/work/workmanager/api/restricted_2.4.0-rc01.txt b/work/workmanager/api/restricted_2.4.0-rc01.txt
index 25adbb9..6c0ce36 100644
--- a/work/workmanager/api/restricted_2.4.0-rc01.txt
+++ b/work/workmanager/api/restricted_2.4.0-rc01.txt
@@ -46,7 +46,7 @@
     method public boolean requiresCharging();
     method @RequiresApi(23) public boolean requiresDeviceIdle();
     method public boolean requiresStorageNotLow();
-    field public static final androidx.work.Constraints! NONE;
+    field public static final androidx.work.Constraints NONE;
   }
 
   public static final class Constraints.Builder {
@@ -84,7 +84,7 @@
     method public String![]? getStringArray(String);
     method public <T> boolean hasKeyWithValueOfType(String, Class<T!>);
     method public byte[] toByteArray();
-    field public static final androidx.work.Data! EMPTY;
+    field public static final androidx.work.Data EMPTY;
     field public static final int MAX_DATA_BYTES = 10240; // 0x2800
   }
 
diff --git a/work/workmanager/api/restricted_current.txt b/work/workmanager/api/restricted_current.txt
index 25adbb9..6c0ce36 100644
--- a/work/workmanager/api/restricted_current.txt
+++ b/work/workmanager/api/restricted_current.txt
@@ -46,7 +46,7 @@
     method public boolean requiresCharging();
     method @RequiresApi(23) public boolean requiresDeviceIdle();
     method public boolean requiresStorageNotLow();
-    field public static final androidx.work.Constraints! NONE;
+    field public static final androidx.work.Constraints NONE;
   }
 
   public static final class Constraints.Builder {
@@ -84,7 +84,7 @@
     method public String![]? getStringArray(String);
     method public <T> boolean hasKeyWithValueOfType(String, Class<T!>);
     method public byte[] toByteArray();
-    field public static final androidx.work.Data! EMPTY;
+    field public static final androidx.work.Data EMPTY;
     field public static final int MAX_DATA_BYTES = 10240; // 0x2800
   }